Author: mrl
Date: Thu Feb 8 17:42:28 2007
New Revision: 118081
Modified:
packages/cooker/mozilla-firefox/current/SPECS/mozilla-firefox.spec
Log:
- Added support for using system's nspr and nss libraries and turn
this the default behavior for >= 200710.
Modified: packages/cooker/mozilla-firefox/current/SPECS/mozilla-firefox.spec
==============================================================================
--- packages/cooker/mozilla-firefox/current/SPECS/mozilla-firefox.spec
(original)
+++ packages/cooker/mozilla-firefox/current/SPECS/mozilla-firefox.spec Thu Feb
8 17:42:28 2007
@@ -12,11 +12,17 @@
%define build_for_corp3 0
%endif
+%if %mdkversion < 200710
+%define build_nss_nspr 1
+%else
+%define build_nss_nspr 0
+%endif
+
#warning : always end release date with 00
# (it should be the hour of build but it is not significant for rpm)
-%define date 2006111500
+%define date 2007020800
-%define rel 6
+%define rel 7
%if %mdkversion < 200700
%define subrel 1
%endif
@@ -27,11 +33,7 @@
#fixed2
%{?!mkrel:%define mkrel(c:) %{-c: 0.%{-c*}.}%{!?_with_unstable:%(perl -e
'$_="%{1}";m/(.\*\\D\+)?(\\d+)$/;$rel=${2}-1;re;print
"$1$rel";').%{?subrel:%subrel}%{!?subrel:1}.%{?distversion:%distversion}%{?!distversion:%(echo
$[%{mdkversion}/10])}}%{?_with_unstable:%{1}}%{?distsuffix:%distsuffix}%{?!distsuffix:mdk}}
-#if %{official_branding}
-#define exec_name firefox
-#else
%define exec_name mozilla-firefox
-#endif
%if %mdkversion <= 200700
%define up_ca_name mozilla-firefox
%else
@@ -48,6 +50,7 @@
%define epoch_mozilla 0
+%if %build_nss_nspr
%define major_nspr 4
%define epoch_nspr 2
%define lib_nspr_name %mklibname nspr %{major_nspr}
@@ -55,6 +58,7 @@
%define major_nss 3
%define epoch_nss 2
%define lib_nss_name %mklibname nss %{major_nss}
+%endif
%define libpkg_major %version
%define libpkg_name %mklibname %name %libpkg_major
@@ -207,10 +211,12 @@
Provides: galeon
Obsoletes: galeon
%endif
-%if %mdkversion < 200700
-Requires: gtk+2 >= 0:2.2.0
+%if %build_nss_nspr
Requires: %{lib_nspr_name} >= %{epoch_nspr}:%{version}
Requires: %{lib_nss_name} >= %{epoch_nss}:%{version}
+%endif
+%if %mdkversion < 200700
+Requires: gtk+2 >= 0:2.2.0
%else
Requires: %{libpkg_name} = %{epoch_mozilla}:%{version}-%{release}
%endif
@@ -228,6 +234,7 @@
- Live bookmarks, using RSS
- "Hassle-free" downloading, with fewer prompts
+%if %build_nss_nspr
%package -n %{lib_nspr_name}
Epoch: %{epoch_nspr}
License: MPL/GPL
@@ -293,6 +300,7 @@
%description -n %{lib_nss_name}-devel
Header files to doing development with Network Security Services.
+%endif
%if %mdkversion >= 200700
%package -n %{libpkg_name}
@@ -300,8 +308,10 @@
Summary: Mozilla Firefox libraries
Group: System/Libraries
Provides: %{libpkg_name_orig} = %{epoch_mozilla}:%{version}-%{release}
+%if %build_nss_nspr
Requires: %{lib_nspr_name} >= %{epoch_nspr}:%{version}
Requires: %{lib_nss_name} >= %{epoch_nss}:%{version}
+%endif
Requires: gtk+2 >= 0:2.2.0
Requires(post): desktop-common-data
Conflicts: mozilla-firefox < 1.5.0.6-3mdv2007.0
@@ -321,7 +331,9 @@
Group: Development/Other
Provides: mozilla-firebird-devel
Obsoletes: mozilla-firebird-devel
+%if %build_nss_nspr
Requires: %{lib_nss_name}-devel = %{epoch_nss}:%{version}-%{release}
+%endif
%if %mdkversion >= 200700
Provides: %{libpkg_name_orig}-devel =
%{epoch_mozilla}:%{version}-%{release}
Provides: %{name}-devel = %{epoch_mozilla}:%{version}-%{release}
@@ -473,15 +485,21 @@
--enable-default-toolkit=gtk2 \
--enable-extensions=default \
--enable-ipv6 \
- --enable-nspr-autoconf \
--enable-optimize="$OPT_FLAGS" \
--enable-single-profile \
--enable-svg \
--enable-xft \
--enable-xinerama \
--with-default-mozilla-five-home=%{mozillalibdir} \
- --without-system-nspr \
--with-system-jpeg \
+%if %build_nss_nspr
+ --enable-nspr-autoconf \
+ --without-system-nspr \
+ --without-system-nss \
+%else
+ --with-system-nspr \
+ --with-system-nss \
+%endif
--with-system-png \
--with-system-zlib
@@ -499,6 +517,7 @@
sed -i -e
'/general\.useragent\.appSub/{N;s/%{version}/%{advertised_version}/g;}' \
%buildroot%{mozillalibdir}/defaults/pref/firefox.js
+%if %build_nss_nspr
#move nspr/nss to %{_libdir}
mv
%buildroot%{mozillalibdir}/{libnspr4.so,libplc4.so,libplds4.so,libnss3.so,libnssckbi.so,libsmime3.so,libsoftokn3.so,libssl3.so,libfreebl3.so,libsoftokn3.chk}
\
%buildroot%{_libdir}
@@ -525,6 +544,7 @@
ln -s -f %{oname}-nspr.pc %buildroot%{_libdir}/pkgconfig/mozilla-nspr.pc
ln -s -f %{oname}-nss.pc %buildroot%{_libdir}/pkgconfig/mozilla-nss.pc
+%endif
%__mkdir_p
%buildroot%{mozillalibdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/
@@ -640,7 +660,9 @@
#multiarch
%if !%build_for_corp3
#
+%if %build_nss_nspr
%multiarch_binaries %buildroot%{_bindir}/nspr-config
+%endif
%multiarch_binaries %buildroot%{_bindir}/%{up_ca_name}-config
%endif
@@ -788,6 +810,7 @@
%config %{mozillalibdir}/defaults/pref/vendor.js
%endif
+%if %build_nss_nspr
%files -n %{lib_nspr_name}
%defattr(-, root, root)
%{_libdir}/libnspr4.so
@@ -826,6 +849,7 @@
%defattr(-, root, root)
%{mozillaincludedir}/nss
%{_libdir}/pkgconfig/*-nss.pc
+%endif
%if %mdkversion < 200700
%files devel
@@ -838,11 +862,17 @@
%multiarch %{multiarch_bindir}/%{up_ca_name}-config
%endif
%mozillaincludedir/*
+%if %build_nss_nspr
%exclude %mozillaincludedir/nss
%exclude %mozillaincludedir/nspr
+%endif
%dir %_datadir/idl/%lib_name
%_datadir/idl/%lib_name/*
%_libdir/pkgconfig/*gtkmozembed.pc
%_libdir/pkgconfig/*js.pc
%_libdir/pkgconfig/*plugin.pc
%_libdir/pkgconfig/*xpcom*.pc
+%if !%build_nss_nspr
+%_libdir/pkgconfig/*-nspr.pc
+%_libdir/pkgconfig/*-nss.pc
+%endif
