Author: mrl
Date: Tue Feb 6 21:22:16 2007
New Revision: 116937
Added:
packages/cooker/mozilla-thunderbird/current/SOURCES/enigmail-0.94.2.tar.gz
- copied, changed from r116705,
/packages/cooker/mozilla-thunderbird/current/SOURCES/enigmail-0.94.1.tar.bz2
packages/cooker/mozilla-thunderbird/current/SOURCES/enigmail-0.94.2.tar.gz.sig
packages/cooker/mozilla-thunderbird/current/SOURCES/mozilla-thunderbird-enigmail-version.patch
Removed:
packages/cooker/mozilla-thunderbird/current/SOURCES/enigmail-0.94.1.tar.bz2
Modified:
packages/cooker/mozilla-thunderbird/current/SOURCES/mozilla-thunderbird.sh.in
packages/cooker/mozilla-thunderbird/current/SPECS/mozilla-thunderbird.spec
Log:
- New upstream: 2.0b2
- Updated enigmail to 0.94.2
- Patched enigmail (patch 306) so it works with TB 2.0b2
- Updated some informations in mozilla-thunderbird.sh.in
- Do not enforce requires on mozilla-nspr and mozilla-nss libraries
- Do not install devel stuff by hand for now: let's use what
they are installing and see if it works.
Copied:
packages/cooker/mozilla-thunderbird/current/SOURCES/enigmail-0.94.2.tar.gz
(from r116705,
/packages/cooker/mozilla-thunderbird/current/SOURCES/enigmail-0.94.1.tar.bz2)
==============================================================================
Binary files. No diff available.
Added:
packages/cooker/mozilla-thunderbird/current/SOURCES/enigmail-0.94.2.tar.gz.sig
==============================================================================
--- (empty file)
+++
packages/cooker/mozilla-thunderbird/current/SOURCES/enigmail-0.94.2.tar.gz.sig
Tue Feb 6 21:22:16 2007
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQBFskcO8EDkG5NpzfMRAsR0AJ9OFvyoTQMt/FVeSkPUCpq5+0Tn4wCdEiG1
+Bg7hPjCbckBVC5JqcBBStPU=
+=H/Ep
+-----END PGP SIGNATURE-----
Added:
packages/cooker/mozilla-thunderbird/current/SOURCES/mozilla-thunderbird-enigmail-version.patch
==============================================================================
--- (empty file)
+++
packages/cooker/mozilla-thunderbird/current/SOURCES/mozilla-thunderbird-enigmail-version.patch
Tue Feb 6 21:22:16 2007
@@ -0,0 +1,11 @@
+---
mozilla-thunderbird-2.0b2/mozilla/extensions/enigmail/package/install.rdf.version
2007-02-06 12:46:53.000000000 -0500
++++ mozilla-thunderbird-2.0b2/mozilla/extensions/enigmail/package/install.rdf
2007-02-06 12:46:56.000000000 -0500
+@@ -15,7 +15,7 @@
+ <!-- Thunderbird -->
+ <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
+ <em:minVersion>1.5.0</em:minVersion>
+- <em:maxVersion>2.0a1</em:maxVersion>
++ <em:maxVersion>2.0b2</em:maxVersion>
+ </Description>
+ <Description>
+ <!-- Seamonkey -->
Modified:
packages/cooker/mozilla-thunderbird/current/SOURCES/mozilla-thunderbird.sh.in
==============================================================================
---
packages/cooker/mozilla-thunderbird/current/SOURCES/mozilla-thunderbird.sh.in
(original)
+++
packages/cooker/mozilla-thunderbird/current/SOURCES/mozilla-thunderbird.sh.in
Tue Feb 6 21:22:16 2007
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# Startup script for the fedora.us Thunderbird RPM
-# (based on the Mozilla RPM launch script)
+# Startup script for the Mandriva Thunderbird RPM
+# (based on the fedora.us RPM launch script)
#
MOZ_LIB_DIR="/usr/lib"
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
Tue Feb 6 21:22:16 2007
@@ -23,7 +23,7 @@
%define tbextuuid \{847b3a00-7ab1-11d4-8f02-006008948af5\}
%define xpi 0
-%define enigmail_version 0.94.1
+%define enigmail_version 0.94.2
%define _provides_exceptions libgtkembedmoz.so\\|libxpcom.so
%define _requires_exceptions libgtkembedmoz.so\\|libxpcom.so
@@ -48,7 +48,7 @@
Summary: A full-featured email, RSS, and newsgroup client
Name: mozilla-thunderbird
-Version: 2.0b1
+Version: 2.0b2
Release: %mkrel 1
Epoch: 0
URL: http://www.mozilla.org/projects/thunderbird/
@@ -65,14 +65,14 @@
Source30: mozilla-thunderbird-open-browser.sh
# Mandriva sources (Source300+)
-Source300:
http://www.mozilla-enigmail.org/downloads/src/enigmail-%{enigmail_version}.tar.bz2
-Source301: %{name}-icons.tar.bz2
-Source302: mozilla-thunderbird-unofficial.png
+Source300:
http://www.mozilla-enigmail.org/downloads/src/enigmail-%{enigmail_version}.tar.gz
+Source301:
http://www.mozilla-enigmail.org/downloads/src/enigmail-%{enigmail_version}.tar.gz.sig
+Source302: %{name}-icons.tar.bz2
+Source303: mozilla-thunderbird-unofficial.png
# Build patches
Patch2: mozilla-firefox-1.0-prdtoa.patch
Patch5: mozilla-firefox-1.1-visibility.patch
-Patch6: mozilla-firefox-1.1-nss-system-nspr.patch
Patch10: mozilla-thunderbird-0.7.3-psfonts.patch
Patch11: mozilla-thunderbird-0.7.3-gnome-uriloader.patch
@@ -100,16 +100,21 @@
Patch302: mozilla-thunderbird-check-default-mailer.patch
Patch304: mozilla-thunderbird-run-mozilla.patch
Patch305: mozilla-thunderbird-2.0b1-x11libs.patch
+Patch306: mozilla-thunderbird-enigmail-version.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: mozilla-nspr >= 0:1.5, mozilla-nss >= 0:1.5
%if !%build_for_corp3
BuildRequires: cairo-devel
%endif
-BuildRequires: libpng-devel, libjpeg-devel, gtk2-devel
-BuildRequires: zlib-devel, gzip, zip, unzip
-BuildRequires: nspr-devel >= 0:1.5
-BuildRequires: nss-devel >= 0:1.5
+BuildRequires: gtk2-devel
+BuildRequires: gzip
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: nspr-devel >= 0:2.0
+BuildRequires: nss-devel >= 0:2.0
+BuildRequires: unzip
+BuildRequires: zip
+BuildRequires: zlib-devel
BuildRequires: libIDL-devel
# Needed by xmlterm (not built) and unused enigmail scripts
#BuildRequires: tcsh
@@ -186,6 +191,9 @@
%prep
%setup -q -c -n %{name}-%{version}
+
+#===================
+# Thunderbird itself
%setup -q -T -D -n %{name}-%{version}/mozilla
%patch2 -p1
@@ -195,8 +203,6 @@
%patch5 -p0
%endif
-## patch falhou (rej & missing)
-##%patch6 -p1
%patch10 -p1 -b .psfonts
%patch11 -p1 -b .gnome-uriloader
%patch25 -p1
@@ -213,7 +219,7 @@
%patch305 -p2 -b .x11libs
#===============================================================================
-
+# Enigmail
%setup -q -T -D -n %{name}-%{version}/mozilla/extensions -a300
%patch210 -p2 -b .enigmail-remove-seamonkey-skin
%patch211 -p2 -b .enigmail-no-upgrade
@@ -222,8 +228,9 @@
%patch213 -p2 -b .enigmail-build-package-contents-rdf
%endif
%patch214 -p2 -b .enigmail-fix
+%patch306 -p3
%if !%{official_branding}
-%setup -q -T -D -n %{name}-%{version}/mozilla -a301
+%setup -q -T -D -n %{name}-%{version}/mozilla -a302
%endif
%setup -q -T -D -n %{name}-%{version}/mozilla
@@ -241,26 +248,32 @@
%build
export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1
+
%if %{mdkversion} <= 1020
%if !%build_for_corp3
export CPPFLAGS="-I%{_includedir}/cairo"
%endif
%endif
+
%if %build_for_corp3
%configure2_5x --disable-pango --disable-system-cairo
%else
%configure2_5x
%endif
+
# Fix ABI for thunderbird and enigmail
%{__perl} -pi -e 's|^TARGET_XPCOM_ABI =.*|TARGET_XPCOM_ABI = %{tbarch}-gcc3|'
config/autoconf.mk
-#%{__perl} -pi -e 's|^ENIG_XPCOM_ABI =.*|ENIG_XPCOM_ABI =
Linux_%{tbarch}-gcc3|' extensions/enigmail/Makefile
+%{__perl} -pi -e 's|^ENIG_XPCOM_ABI =.*|ENIG_XPCOM_ABI =
Linux_%{tbarch}-gcc3|' extensions/enigmail/Makefile
+
# Compress jars
%{__perl} -pi -e 's|\-0|\-9|g' config/make-jars.pl
+
%make
#===============================================================================
cd extensions/enigmail
+
for i in `find . -type f -name Makefile.in`; do
if [ -f $i.bak ]; then
cp $i.bak $i
@@ -269,13 +282,17 @@
fi
%{__perl} -pi -e 's|^(DEPTH.*= )../|\1|;' $i
done
+
./makemake -r
%make LOCAL_INCLUDES+="-I\$(DEPTH)/mailnews/mime/src
-I\$(DEPTH)/extensions/enigmail/build -I\$(DEPTH)/extensions/enigmail/src
-I\$(DEPTH)/extensions/enigmail/ipc/build
-I\$(DEPTH)/extensions/enigmail/ipc/src"
+
(cd lang
%{__perl} -pi -e 's|es-AR/enigmail.properties|es-ES/enigmail.properties|'
jar.mn
%make LOCAL_INCLUDES+="-I\$(DEPTH)/mailnews/mime/src
-I\$(DEPTH)/extensions/enigmail/build -I\$(DEPTH)/extensions/enigmail/src
-I\$(DEPTH)/extensions/enigmail/ipc/src"
)
+
%make xpi
+
cd ../..
#===============================================================================
@@ -284,15 +301,6 @@
%{__rm} -rf %{buildroot}
%{__mkdir_p} %{buildroot}{%{_libdir},%{_bindir},%{_datadir}/applications}
-#(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
-
make install DESTDIR=%{buildroot}
%if %{official_branding}
@@ -335,10 +343,6 @@
%{__cp} -a %{buildroot}/mdv-default-prefs
%{buildroot}/%{tbdir}/defaults/pref/all-mandriva.js
%{__rm} -f %{buildroot}/mdv-default-prefs
-# fix permissions
-## LICENSE.txt does not exist anymore
-##%{__chmod} 644 %{buildroot}%{tbdir}/LICENSE.txt
-
#===============================================================================
# menu
@@ -378,54 +382,66 @@
#===============================================================================
-#%{__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}
-%{__cp} -aL include/* %{buildroot}%{_includedir}/%{name}-%{version}
-%{__mkdir_p} %{buildroot}%{_datadir}/idl/%{name}-%{version}
-%{__cp} -aL idl/* %{buildroot}%{_datadir}/idl/%{name}-%{version}
-popd
-
-pushd dist/sdk
-%{__mkdir_p} %{buildroot}%{_libdir}/%{name}-%{version}
-%{__cp} -aL bin/* %{buildroot}%{_libdir}/%{name}-%{version}
-%{__mkdir_p} %{buildroot}%{_includedir}/%{name}-%{version}
-%{__cp} -aL include/* %{buildroot}%{_includedir}/%{name}-%{version}
-%{__mkdir_p} %{buildroot}%{_datadir}/idl/%{name}-%{version}
-%{__cp} -aL idl/* %{buildroot}%{_datadir}/idl/%{name}-%{version}
-popd
+#pushd dist
+#%{__mkdir_p} %{buildroot}%{_includedir}/%{oname}-%{version}
+#%{__cp} -aL include/* %{buildroot}%{_includedir}/%{oname}-%{version}
+#%{__mkdir_p} %{buildroot}%{_datadir}/idl/%{oname}-%{version}
+#%{__cp} -aL idl/* %{buildroot}%{_datadir}/idl/%{oname}-%{version}
+#popd
+
+#pushd dist/sdk
+#%{__mkdir_p} %{buildroot}%{_libdir}/%{oname}-%{version}
+#%{__cp} -aL bin/* %{buildroot}%{_libdir}/%{oname}-%{version}
+#%{__mkdir_p} %{buildroot}%{_includedir}/%{oname}-%{version}
+#%{__cp} -aL include/* %{buildroot}%{_includedir}/%{oname}-%{version}
+#%{__mkdir_p} %{buildroot}%{_datadir}/idl/%{oname}-%{version}
+#%{__cp} -aL idl/* %{buildroot}%{_datadir}/idl/%{oname}-%{version}
+#popd
%if !%build_for_corp3
%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
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_aix.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_beos.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_bsdi.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_darwin.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_dgux.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_freebsd.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_hpux.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_irix.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_linux.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_macos.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_ncr.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_nec.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_netbsd.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_nextstep.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_nspr_pthread.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_nto.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_openbsd.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_openvms.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_os2_errors.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_os2.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_osf1.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_pcos.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_pth.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_qnx.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_reliantunix.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_rhapsody.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_riscos.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_scoos.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_solaris.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_sony.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_sunos4.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_unix_errors.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_unixos.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_unixware.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_win16.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_win32_errors.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_win95.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/_winnt.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/prosdep.h
+%multiarch_includes
%{buildroot}%{_includedir}/%{oname}-%{version}/nspr/md/sunos4.h
%endif
#===============================================================================
@@ -617,45 +633,53 @@
%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
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_aix.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_beos.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_bsdi.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_darwin.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_dgux.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_freebsd.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_hpux.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_irix.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_linux.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_macos.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_ncr.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_nec.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_netbsd.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_nextstep.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_nspr_pthread.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_nto.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_openbsd.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_openvms.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_os2_errors.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_os2.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_osf1.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_pcos.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_pth.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_qnx.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_reliantunix.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_rhapsody.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_riscos.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_scoos.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_solaris.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_sony.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_sunos4.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_unix_errors.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_unixos.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_unixware.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_win16.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_win32_errors.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_win95.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/_winnt.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/prosdep.h
+%{multiarch_includedir}/%{oname}-%{version}/nspr/md/sunos4.h
%endif
%attr(755,root,root) %{tbdir}/regxpcom
%attr(755,root,root) %{tbdir}/xpidl
%attr(755,root,root) %{tbdir}/xpt_dump
%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
