Author: mrl
Date: Fri Feb 9 14:10:49 2007
New Revision: 118428
Modified:
packages/cooker/mozilla-thunderbird/current/SPECS/mozilla-thunderbird.spec
Log:
- More improvements in order to use system's nspr.
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
Fri Feb 9 14:10:49 2007
@@ -110,8 +110,8 @@
BuildRequires: gzip
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
-BuildRequires: nspr-devel >= 0:2.0
-BuildRequires: nss-devel >= 0:2.0
+BuildRequires: nspr-devel
+BuildRequires: nss-devel
BuildRequires: unzip
BuildRequires: zip
BuildRequires: zlib-devel
@@ -402,46 +402,6 @@
%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/_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
#===============================================================================
@@ -467,9 +427,6 @@
#===============================================================================
# remove files already packaged as system libs
-%{__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
#%{__chmod} 644 %{buildroot}%{tbdir}/extensions/*/defaults/pref*/enigmail.js
#%{__perl} -pi -e 's|agentPath",""|agentPath","%{_bindir}/gpg"|'
%{buildroot}%{tbdir}/extensions/*/defaults/pref*/enigmail.js
@@ -633,46 +590,6 @@
%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/_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
@@ -686,7 +603,6 @@
%{_libdir}/pkgconfig/thunderbird-nss.pc
%{_libdir}/pkgconfig/thunderbird-plugin.pc
%{_libdir}/pkgconfig/thunderbird-xpcom.pc
-%{_datadir}/aclocal/nspr.m4
%files enigmail
