Author: mrl
Date: Mon Feb 5 21:12:03 2007
New Revision: 116484
Added:
packages/cooker/mozilla-thunderbird/current/SOURCES/mozilla-thunderbird-2.0-software-update.patch
- copied, changed from r102267,
/packages/cooker/mozilla-thunderbird/current/SOURCES/mozilla-thunderbird-1.1-software-update.patch
packages/cooker/mozilla-thunderbird/current/SOURCES/mozilla-thunderbird-2.0b1-x11libs.patch
packages/cooker/mozilla-thunderbird/current/SOURCES/thunderbird-2.0b1-source.tar.bz2
- copied, changed from r102267,
/packages/cooker/mozilla-thunderbird/current/SOURCES/thunderbird-1.5.0.9-source.tar.bz2
packages/cooker/mozilla-thunderbird/current/SOURCES/thunderbird-2.0b1-source.tar.bz2.asc
- copied, changed from r102267,
/packages/cooker/mozilla-thunderbird/current/SOURCES/thunderbird-1.5.0.9-source.tar.bz2.asc
Removed:
packages/cooker/mozilla-thunderbird/current/SOURCES/mozilla-firefox-1.1-nss-system-nspr.patch
packages/cooker/mozilla-thunderbird/current/SOURCES/mozilla-firefox-1.5-with-system-nss.patch
packages/cooker/mozilla-thunderbird/current/SOURCES/mozilla-thunderbird-0.8-default-applications.patch
packages/cooker/mozilla-thunderbird/current/SOURCES/mozilla-thunderbird-1.1-software-update.patch
packages/cooker/mozilla-thunderbird/current/SOURCES/thunderbird-1.5.0.9-source.tar.bz2
packages/cooker/mozilla-thunderbird/current/SOURCES/thunderbird-1.5.0.9-source.tar.bz2.asc
Modified:
packages/cooker/mozilla-thunderbird/current/SOURCES/mozilla-thunderbird-check-default-mailer.patch
packages/cooker/mozilla-thunderbird/current/SPECS/mozilla-thunderbird.spec
Log:
- First 2.0 series commit
- Rediffed patches: software-update, check-default-mailer and
default-applications
- Added patch x11libs.
- Unstable. Do not use this yet. More commits to come. SILENT
Copied:
packages/cooker/mozilla-thunderbird/current/SOURCES/mozilla-thunderbird-2.0-software-update.patch
(from r102267,
/packages/cooker/mozilla-thunderbird/current/SOURCES/mozilla-thunderbird-1.1-software-update.patch)
==============================================================================
---
/packages/cooker/mozilla-thunderbird/current/SOURCES/mozilla-thunderbird-1.1-software-update.patch
(original)
+++
packages/cooker/mozilla-thunderbird/current/SOURCES/mozilla-thunderbird-2.0-software-update.patch
Mon Feb 5 21:12:03 2007
@@ -1,12 +1,7 @@
-Index: mail/components/preferences/advanced.xul
-===================================================================
-RCS file: /cvsroot/mozilla/mail/components/preferences/advanced.xul,v
-retrieving revision 1.13.2.1
-diff -d -u -p -r1.13.2.1 advanced.xul
---- mail/components/preferences/advanced.xul 2 Sep 2005 23:29:08 -0000
1.13.2.1
-+++ mail/components/preferences/advanced.xul 15 Sep 2005 05:50:06 -0000
-@@ -66,19 +66,8 @@
- <preference id="offline.download.download_messages"
name="offline.download.download_messages" type="int"/>
+--- mozilla/mail/components/preferences/advanced.xul.update 2006-12-04
03:43:32.000000000 -0200
++++ mozilla/mail/components/preferences/advanced.xul 2007-02-05
16:44:29.000000000 -0200
+@@ -65,19 +65,8 @@
+ <preference id="mailnews.tcptimeout" name="mailnews.tcptimeout"
type="int"/>
<preference id="mail.prompt_purge_threshhold"
name="mail.prompt_purge_threshhold" type="bool"/>
<preference id="mail.purge_threshhold"
name="mail.purge_threshhold" type="int"/>
- <preference id="app.update.enabled" name="app.update.enabled"
type="bool"
@@ -22,6 +17,6 @@
- <preference id="app.update.disable_button.showUpdateHistory"
- name="app.update.disable_button.showUpdateHistory"
- type="bool"/>
- </preferences>
-
- <tabbox id="advancedPrefs" flex="1"
onselect="gAdvancedPane.tabSelectionChanged();">
+ <preference id="security.disable_button.openCertManager"
+ name="security.disable_button.openCertManager"
+ type="bool"/>
Added:
packages/cooker/mozilla-thunderbird/current/SOURCES/mozilla-thunderbird-2.0b1-x11libs.patch
==============================================================================
--- (empty file)
+++
packages/cooker/mozilla-thunderbird/current/SOURCES/mozilla-thunderbird-2.0b1-x11libs.patch
Mon Feb 5 21:12:03 2007
@@ -0,0 +1,10 @@
+--- mozilla-thunderbird-2.0b1/mozilla/layout/build/Makefile.in.mrl
2007-01-09 07:48:51.000000000 -0500
++++ mozilla-thunderbird-2.0b1/mozilla/layout/build/Makefile.in 2007-01-09
07:49:38.000000000 -0500
+@@ -207,6 +207,7 @@
+ $(MOZ_UNICHARUTIL_LIBS) \
+ $(MOZ_COMPONENT_LIBS) \
+ $(MOZ_JS_LIBS) \
++ -lX11 -lXrender \
+ $(NULL)
+
+ ifdef MOZ_ENABLE_XLIB
Modified:
packages/cooker/mozilla-thunderbird/current/SOURCES/mozilla-thunderbird-check-default-mailer.patch
==============================================================================
---
packages/cooker/mozilla-thunderbird/current/SOURCES/mozilla-thunderbird-check-default-mailer.patch
(original)
+++
packages/cooker/mozilla-thunderbird/current/SOURCES/mozilla-thunderbird-check-default-mailer.patch
Mon Feb 5 21:12:03 2007
@@ -1,11 +1,11 @@
---- mozilla/mail/app/profile/all-thunderbird.js~ 2006-01-21
04:19:01.000000000 +0100
-+++ mozilla/mail/app/profile/all-thunderbird.js 2006-01-21
04:21:39.000000000 +0100
-@@ -219,7 +219,7 @@
+--- ./mozilla/mail/app/profile/all-thunderbird.js.check 2006-12-01
04:57:58.000000000 -0200
++++ ./mozilla/mail/app/profile/all-thunderbird.js 2007-02-05
17:05:43.000000000 -0200
+@@ -135,7 +135,7 @@
+ pref("xpinstall.whitelist.add", "update.mozilla.org");
+ pref("xpinstall.whitelist.add.103", "addons.mozilla.org");
- // whether to check if we are the default mail, news or feed client
- // on startup.
--pref("mail.checkDefaultMail", true);
-+pref("mail.checkDefaultMail", false);
- pref("mail.checkDefaultNews", false);
- pref("mail.checkDefaultFeed", false);
+-pref("mail.shell.checkDefaultClient", true);
++pref("mail.shell.checkDefaultClient", false);
+ pref("mail.spellcheck.inline", true);
+ pref("mail.showPreviewText", true); // enables preview text in mail alerts
and folder tooltips
Copied:
packages/cooker/mozilla-thunderbird/current/SOURCES/thunderbird-2.0b1-source.tar.bz2
(from r102267,
/packages/cooker/mozilla-thunderbird/current/SOURCES/thunderbird-1.5.0.9-source.tar.bz2)
==============================================================================
Binary files. No diff available.
Copied:
packages/cooker/mozilla-thunderbird/current/SOURCES/thunderbird-2.0b1-source.tar.bz2.asc
(from r102267,
/packages/cooker/mozilla-thunderbird/current/SOURCES/thunderbird-1.5.0.9-source.tar.bz2.asc)
==============================================================================
---
/packages/cooker/mozilla-thunderbird/current/SOURCES/thunderbird-1.5.0.9-source.tar.bz2.asc
(original)
+++
packages/cooker/mozilla-thunderbird/current/SOURCES/thunderbird-2.0b1-source.tar.bz2.asc
Mon Feb 5 21:12:03 2007
@@ -1,7 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (Cygwin)
-iD8DBQBFhYcXaW40MQ42BtkRAsQHAJ4gKqwG/dMKf8CAZoUxUgtBLVVstgCgtDAm
-AW6/+xE0YxOnB+dZu+Ly6ik=
-=T+Mk
+iD8DBQBFfe9JaW40MQ42BtkRAiKcAJ9eDo8LskZU26ohpz6u9U7sieNCPwCbBEbw
+rSOL/+ktWYP9EDNcaRPWCiA=
+=tyI3
-----END PGP SIGNATURE-----
Modified:
packages/cooker/mozilla-thunderbird/current/SPECS/mozilla-thunderbird.spec
==============================================================================
--- packages/cooker/mozilla-thunderbird/current/SPECS/mozilla-thunderbird.spec
(original)
+++ packages/cooker/mozilla-thunderbird/current/SPECS/mozilla-thunderbird.spec
Mon Feb 5 21:12:03 2007
@@ -12,12 +12,13 @@
%endif
%if %{official_branding}
-%define oname Mozilla Thunderbird
+%define title Mozilla Thunderbird
%else
-%define oname Mail/News
+%define title Mail/News
%endif
-%define tbdir %{_libdir}/%{name}-%{version}
+%define oname thunderbird
+%define tbdir %{_libdir}/%{oname}-%{version}
%define tbextdir %{tbdir}-extensions
%define tbextuuid \{847b3a00-7ab1-11d4-8f02-006008948af5\}
@@ -47,7 +48,7 @@
Summary: A full-featured email, RSS, and newsgroup client
Name: mozilla-thunderbird
-Version: 1.5.0.9
+Version: 2.0b1
Release: %mkrel 1
Epoch: 0
URL: http://www.mozilla.org/projects/thunderbird/
@@ -70,7 +71,6 @@
# Build patches
Patch2: mozilla-firefox-1.0-prdtoa.patch
-Patch4: mozilla-firefox-1.5-with-system-nss.patch
Patch5: mozilla-firefox-1.1-visibility.patch
Patch6: mozilla-firefox-1.1-nss-system-nspr.patch
@@ -78,8 +78,7 @@
Patch11: mozilla-thunderbird-0.7.3-gnome-uriloader.patch
# customization patches
-Patch24: mozilla-thunderbird-0.8-default-applications.patch
-Patch25: mozilla-thunderbird-1.1-software-update.patch
+Patch25: mozilla-thunderbird-2.0-software-update.patch
# local bugfixes
Patch42: mozilla-firefox-1.1-uriloader.patch
@@ -100,6 +99,7 @@
Patch301: mozilla-thunderbird-enigmail-package.patch
Patch302: mozilla-thunderbird-check-default-mailer.patch
Patch304: mozilla-thunderbird-run-mozilla.patch
+Patch305: mozilla-thunderbird-2.0b1-x11libs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: mozilla-nspr >= 0:1.5, mozilla-nss >= 0:1.5
@@ -130,7 +130,7 @@
%endif
%description
-%{oname} is a full-featured email, RSS and newsgroup client that
+%{title} is a full-featured email, RSS and newsgroup client that
makes emailing safer, faster and easier than ever before.
#===============================================================================
@@ -159,7 +159,7 @@
Requires(postun): mktemp
%description enigmail
-Enigmail is an extension to the mail client of %{oname}
+Enigmail is an extension to the mail client of %{title}
which allows users to access the authentication and encryption
features provided by GnuPG.
@@ -189,18 +189,17 @@
%setup -q -T -D -n %{name}-%{version}/mozilla
%patch2 -p1
-%patch4 -p1
# See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20297
%ifnarch %{ix86}
%patch5 -p0
%endif
-%patch6 -p1
+## patch falhou (rej & missing)
+##%patch6 -p1
%patch10 -p1 -b .psfonts
%patch11 -p1 -b .gnome-uriloader
-%patch24 -p1
-%patch25 -p0
+%patch25 -p1
%patch42 -p0
%patch81 -p1
@@ -208,9 +207,11 @@
%patch300 -p1 -b .progname
%patch301 -p1 -b .enigmailpackage
-%patch302 -p1 -b .check
+%patch302 -p2 -b .check
%patch304 -p1 -b .run-mozilla
+%patch305 -p2 -b .x11libs
+
#===============================================================================
%setup -q -T -D -n %{name}-%{version}/mozilla/extensions -a300
@@ -281,15 +282,18 @@
%install
%{__rm} -rf %{buildroot}
-
-(cd mail/installer && %make STRIP=/bin/true)
-
%{__mkdir_p} %{buildroot}{%{_libdir},%{_bindir},%{_datadir}/applications}
-%{__tar} -C %{buildroot}%{_libdir}/ -xzf dist/thunderbird-*linux*.tar.gz
-%{__mv} %{buildroot}%{_libdir}/thunderbird %{buildroot}%{tbdir}
+#(cd mail/installer && %make STRIP=/bin/true)
+#
+#%{__mkdir_p} %{buildroot}{%{_libdir},%{_bindir},%{_datadir}/applications}
+#
+#%{__tar} -C %{buildroot}%{_libdir}/ -xzf dist/thunderbird-*linux*.tar.gz
+#%{__mv} %{buildroot}%{_libdir}/thunderbird %{buildroot}%{tbdir}
+#
+#%{__rm} -f %{buildroot}%{_libdir}/thunderbird-*linux*.tar
-%{__rm} -f %{buildroot}%{_libdir}/thunderbird-*linux*.tar
+make install DESTDIR=%{buildroot}
%if %{official_branding}
%{__install} -p -D %{SOURCE22} %{buildroot}%{_datadir}/pixmaps/%{name}.png
@@ -301,7 +305,7 @@
[Desktop Entry]
Version=1.0
Encoding=UTF-8
-Name=%{oname}
+Name=%{title}
GenericName=Mail/News
Comment=Mail and News Client
Exec=%{name}
@@ -332,7 +336,8 @@
%{__rm} -f %{buildroot}/mdv-default-prefs
# fix permissions
-%{__chmod} 644 %{buildroot}%{tbdir}/LICENSE.txt
+## LICENSE.txt does not exist anymore
+##%{__chmod} 644 %{buildroot}%{tbdir}/LICENSE.txt
#===============================================================================
@@ -345,7 +350,7 @@
icon="%{name}.png" \\
section="Internet/Mail" \\
%if %{official_branding}
-title="%{oname}" \\
+title="%{title}" \\
%else
title="Mail and News" \\
%endif
@@ -373,8 +378,8 @@
#===============================================================================
-%{__cp} -aL dist/bin/thunderbird-config %{buildroot}%{_bindir}/%{name}-config
-%{__perl} -pi -e 's|thunderbird-%{version}|%{name}-%{version}|g'
%{buildroot}%{_bindir}/%{name}-config
+#%{__cp} -aL dist/bin/thunderbird-config %{buildroot}%{_bindir}/%{name}-config
+#%{__perl} -pi -e 's|thunderbird-%{version}|%{name}-%{version}|g'
%{buildroot}%{_bindir}/%{name}-config
pushd dist
%{__mkdir_p} %{buildroot}%{_includedir}/%{name}-%{version}
@@ -393,34 +398,34 @@
popd
%if !%build_for_corp3
-%multiarch_binaries %{buildroot}%{_bindir}/%{name}-config
-%multiarch_includes
%{buildroot}%{_includedir}/%{name}-%{version}/mozilla-config.h
-%multiarch_includes
%{buildroot}%{_includedir}/%{name}-%{version}/js/jsautocfg.h
-%multiarch_includes
%{buildroot}%{_includedir}/%{name}-%{version}/nspr/md/_aix32.cfg
-%multiarch_includes
%{buildroot}%{_includedir}/%{name}-%{version}/nspr/md/_aix64.cfg
-%multiarch_includes
%{buildroot}%{_includedir}/%{name}-%{version}/nspr/md/_beos.cfg
-%multiarch_includes
%{buildroot}%{_includedir}/%{name}-%{version}/nspr/md/_darwin.cfg
-%multiarch_includes
%{buildroot}%{_includedir}/%{name}-%{version}/nspr/md/_dgux.cfg
-%multiarch_includes
%{buildroot}%{_includedir}/%{name}-%{version}/nspr/md/_hpux32.cfg
-%multiarch_includes
%{buildroot}%{_includedir}/%{name}-%{version}/nspr/md/_hpux64.cfg
-%multiarch_includes
%{buildroot}%{_includedir}/%{name}-%{version}/nspr/md/_irix32.cfg
-%multiarch_includes
%{buildroot}%{_includedir}/%{name}-%{version}/nspr/md/_irix64.cfg
-%multiarch_includes
%{buildroot}%{_includedir}/%{name}-%{version}/nspr/md/_ncr.cfg
-%multiarch_includes
%{buildroot}%{_includedir}/%{name}-%{version}/nspr/md/_nec.cfg
-%multiarch_includes
%{buildroot}%{_includedir}/%{name}-%{version}/nspr/md/_nto.cfg
-%multiarch_includes
%{buildroot}%{_includedir}/%{name}-%{version}/nspr/md/_openvms.cfg
-%multiarch_includes
%{buildroot}%{_includedir}/%{name}-%{version}/nspr/md/_os2.cfg
-%multiarch_includes
%{buildroot}%{_includedir}/%{name}-%{version}/nspr/md/_osf1.cfg
-%multiarch_includes
%{buildroot}%{_includedir}/%{name}-%{version}/nspr/md/_qnx.cfg
-%multiarch_includes
%{buildroot}%{_includedir}/%{name}-%{version}/nspr/md/_reliantunix.cfg
-%multiarch_includes
%{buildroot}%{_includedir}/%{name}-%{version}/nspr/md/_rhapsody.cfg
-%multiarch_includes
%{buildroot}%{_includedir}/%{name}-%{version}/nspr/md/_riscos.cfg
-%multiarch_includes
%{buildroot}%{_includedir}/%{name}-%{version}/nspr/md/_scoos.cfg
-%multiarch_includes
%{buildroot}%{_includedir}/%{name}-%{version}/nspr/md/_sony.cfg
-%multiarch_includes
%{buildroot}%{_includedir}/%{name}-%{version}/nspr/md/_sunos4.cfg
-%multiarch_includes
%{buildroot}%{_includedir}/%{name}-%{version}/nspr/md/_unixware.cfg
-%multiarch_includes
%{buildroot}%{_includedir}/%{name}-%{version}/nspr/md/_unixware7.cfg
-%multiarch_includes
%{buildroot}%{_includedir}/%{name}-%{version}/nspr/md/_win16.cfg
+%multiarch_binaries %{buildroot}%{_bindir}/%{oname}-config
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/mozilla-config.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/js/jsautocfg.h
+#multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_aix32.cfg
+#multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_aix64.cfg
+#multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_beos.cfg
+#multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_darwin.cfg
+#multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_dgux.cfg
+#multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_hpux32.cfg
+#multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_hpux64.cfg
+#multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_irix32.cfg
+#multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_irix64.cfg
+#multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_ncr.cfg
+#multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_nec.cfg
+#multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_nto.cfg
+#multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_openvms.cfg
+#multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_os2.cfg
+#multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_osf1.cfg
+#multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_qnx.cfg
+#multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_reliantunix.cfg
+#multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_rhapsody.cfg
+#multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_riscos.cfg
+#multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_scoos.cfg
+#multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_sony.cfg
+#multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_sunos4.cfg
+#multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_unixware.cfg
+#multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_unixware7.cfg
+#multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_win16.cfg
%endif
#===============================================================================
@@ -449,8 +454,9 @@
%{__rm} %{buildroot}%{tbdir}/{libnspr4.so,libplc4.so,libplds4.so}
%{__rm}
%{buildroot}%{tbdir}/{libnss3.so,libnssckbi.so,libsmime3.so,libsoftokn3.so,libssl3.so,libsoftokn3.chk}
-%{__chmod} 644 %{buildroot}%{tbdir}/defaults/pref/enigmail.js
-%{__perl} -pi -e 's|agentPath",""|agentPath","%{_bindir}/gpg"|'
%{buildroot}%{tbdir}/defaults/pref/enigmail.js
+#%{__chmod} 644 %{buildroot}%{tbdir}/defaults/pref/enigmail.js
+#%{__chmod} 644 %{buildroot}%{tbdir}/extensions/*/defaults/pref*/enigmail.js
+#%{__perl} -pi -e 's|agentPath",""|agentPath","%{_bindir}/gpg"|'
%{buildroot}%{tbdir}/extensions/*/defaults/pref*/enigmail.js
%{__cp} -aL dist/bin/nsinstall %{buildroot}%{_bindir}
@@ -585,56 +591,57 @@
%exclude %{tbdir}/xpt_dump
%exclude %{tbdir}/xpt_link
# enigmail
-%exclude %{tbdir}/enigmail-%{enigmail_version}-linux-*.xpi
%if !%{xpi}
%exclude %{tbdir}/extensions/%{tbextuuid}
+%else
+%exclude %{tbdir}/enigmail-%{enigmail_version}-linux-*.xpi
%endif
-%exclude %{tbdir}/components/enigmail.js
-%exclude %{tbdir}/components/enigmail.xpt
-%exclude %{tbdir}/components/enigprefs-service.js
-%exclude %{tbdir}/chrome/enigmail.jar
-%exclude %{tbdir}/chrome/enigmail-skin-tbird.jar
-%exclude %{tbdir}/defaults/pref/enigmail.js
-%exclude %{tbdir}/defaults/preferences/enigmail.js
-%exclude %{tbdir}/chrome/enigmail-??-??.jar
+#%exclude %{tbdir}/components/enigmail.js
+#%exclude %{tbdir}/components/enigmail.xpt
+#%exclude %{tbdir}/components/enigprefs-service.js
+#%exclude %{tbdir}/chrome/enigmail.jar
+#%exclude %{tbdir}/chrome/enigmail-skin-tbird.jar
+#%exclude %{tbdir}/defaults/pref/enigmail.js
+#%exclude %{tbdir}/defaults/preferences/enigmail.js
+#%exclude %{tbdir}/chrome/enigmail-??-??.jar
# enigmime
-%exclude %{tbdir}/components/enigmime.xpt
-%exclude %{tbdir}/components/ipc.xpt
-%exclude %{tbdir}/components/libenigmime.so
-%exclude %{tbdir}/chrome/enigmime.jar
+#%exclude %{tbdir}/components/enigmime.xpt
+#%exclude %{tbdir}/components/ipc.xpt
+#%exclude %{tbdir}/components/libenigmime.so
+#%exclude %{tbdir}/chrome/enigmime.jar
%files devel
%defattr(-,root,root,-)
-%attr(755,root,root) %{_bindir}/%{name}-config
+%attr(755,root,root) %{_bindir}/%{oname}-config
%if !%build_for_corp3
-%attr(755,root,root) %{multiarch_bindir}/%{name}-config
-%{multiarch_includedir}/%{name}-%{version}/mozilla-config.h
-%{multiarch_includedir}/%{name}-%{version}/js/jsautocfg.h
-%{multiarch_includedir}/%{name}-%{version}/nspr/md/_aix32.cfg
-%{multiarch_includedir}/%{name}-%{version}/nspr/md/_aix64.cfg
-%{multiarch_includedir}/%{name}-%{version}/nspr/md/_beos.cfg
-%{multiarch_includedir}/%{name}-%{version}/nspr/md/_darwin.cfg
-%{multiarch_includedir}/%{name}-%{version}/nspr/md/_dgux.cfg
-%{multiarch_includedir}/%{name}-%{version}/nspr/md/_hpux32.cfg
-%{multiarch_includedir}/%{name}-%{version}/nspr/md/_hpux64.cfg
-%{multiarch_includedir}/%{name}-%{version}/nspr/md/_irix32.cfg
-%{multiarch_includedir}/%{name}-%{version}/nspr/md/_irix64.cfg
-%{multiarch_includedir}/%{name}-%{version}/nspr/md/_ncr.cfg
-%{multiarch_includedir}/%{name}-%{version}/nspr/md/_nec.cfg
-%{multiarch_includedir}/%{name}-%{version}/nspr/md/_nto.cfg
-%{multiarch_includedir}/%{name}-%{version}/nspr/md/_openvms.cfg
-%{multiarch_includedir}/%{name}-%{version}/nspr/md/_os2.cfg
-%{multiarch_includedir}/%{name}-%{version}/nspr/md/_osf1.cfg
-%{multiarch_includedir}/%{name}-%{version}/nspr/md/_qnx.cfg
-%{multiarch_includedir}/%{name}-%{version}/nspr/md/_reliantunix.cfg
-%{multiarch_includedir}/%{name}-%{version}/nspr/md/_rhapsody.cfg
-%{multiarch_includedir}/%{name}-%{version}/nspr/md/_riscos.cfg
-%{multiarch_includedir}/%{name}-%{version}/nspr/md/_scoos.cfg
-%{multiarch_includedir}/%{name}-%{version}/nspr/md/_sony.cfg
-%{multiarch_includedir}/%{name}-%{version}/nspr/md/_sunos4.cfg
-%{multiarch_includedir}/%{name}-%{version}/nspr/md/_unixware.cfg
-%{multiarch_includedir}/%{name}-%{version}/nspr/md/_unixware7.cfg
-%{multiarch_includedir}/%{name}-%{version}/nspr/md/_win16.cfg
+%attr(755,root,root) %{multiarch_bindir}/%{oname}-config
+%{multiarch_includedir}/%{oname}-%{version}/mozilla-config.h
+%{multiarch_includedir}/%{oname}-%{version}/js/jsautocfg.h
+#{multiarch_includedir}/%{oname}-%{version}/nspr/md/_aix32.cfg
+#{multiarch_includedir}/%{oname}-%{version}/nspr/md/_aix64.cfg
+#{multiarch_includedir}/%{oname}-%{version}/nspr/md/_beos.cfg
+#{multiarch_includedir}/%{oname}-%{version}/nspr/md/_darwin.cfg
+#{multiarch_includedir}/%{oname}-%{version}/nspr/md/_dgux.cfg
+#{multiarch_includedir}/%{oname}-%{version}/nspr/md/_hpux32.cfg
+#{multiarch_includedir}/%{oname}-%{version}/nspr/md/_hpux64.cfg
+#{multiarch_includedir}/%{oname}-%{version}/nspr/md/_irix32.cfg
+#{multiarch_includedir}/%{oname}-%{version}/nspr/md/_irix64.cfg
+#{multiarch_includedir}/%{oname}-%{version}/nspr/md/_ncr.cfg
+#{multiarch_includedir}/%{oname}-%{version}/nspr/md/_nec.cfg
+#{multiarch_includedir}/%{oname}-%{version}/nspr/md/_nto.cfg
+#{multiarch_includedir}/%{oname}-%{version}/nspr/md/_openvms.cfg
+#{multiarch_includedir}/%{oname}-%{version}/nspr/md/_os2.cfg
+#{multiarch_includedir}/%{oname}-%{version}/nspr/md/_osf1.cfg
+#{multiarch_includedir}/%{oname}-%{version}/nspr/md/_qnx.cfg
+#{multiarch_includedir}/%{oname}-%{version}/nspr/md/_reliantunix.cfg
+#{multiarch_includedir}/%{oname}-%{version}/nspr/md/_rhapsody.cfg
+#{multiarch_includedir}/%{oname}-%{version}/nspr/md/_riscos.cfg
+#{multiarch_includedir}/%{oname}-%{version}/nspr/md/_scoos.cfg
+#{multiarch_includedir}/%{oname}-%{version}/nspr/md/_sony.cfg
+#{multiarch_includedir}/%{oname}-%{version}/nspr/md/_sunos4.cfg
+#{multiarch_includedir}/%{oname}-%{version}/nspr/md/_unixware.cfg
+#{multiarch_includedir}/%{oname}-%{version}/nspr/md/_unixware7.cfg
+#{multiarch_includedir}/%{oname}-%{version}/nspr/md/_win16.cfg
%endif
%attr(755,root,root) %{tbdir}/regxpcom
%attr(755,root,root) %{tbdir}/xpidl
@@ -642,6 +649,21 @@
%attr(755,root,root) %{tbdir}/xpt_link
%{_includedir}/%{name}-%{version}
%{_datadir}/idl/%{name}-%{version}
+%{_includedir}/%{oname}-%{version}
+%{_datadir}/idl/%{oname}-%{version}
+
+%{_libdir}/mozilla-thunderbird-2.0b1/regxpcom
+%{_libdir}/mozilla-thunderbird-2.0b1/xpidl
+%{_libdir}/mozilla-thunderbird-2.0b1/xpt_dump
+%{_libdir}/mozilla-thunderbird-2.0b1/xpt_link
+%{_libdir}/pkgconfig/thunderbird-gtkmozembed.pc
+%{_libdir}/pkgconfig/thunderbird-js.pc
+%{_libdir}/pkgconfig/thunderbird-nspr.pc
+%{_libdir}/pkgconfig/thunderbird-nss.pc
+%{_libdir}/pkgconfig/thunderbird-plugin.pc
+%{_libdir}/pkgconfig/thunderbird-xpcom.pc
+%{_datadir}/aclocal/nspr.m4
+
%files enigmail
%defattr(-,root,root)
