X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=nss.spec;h=34c5340ab28c5bdcf98097a5b10cc70ed2e50db7;hb=1015f12720b04230e1d82a91672a27fd2c803a0e;hp=376d3a9618ec91faa9aa7d957573358be7f53bef;hpb=0e541f12650c6f4b1596acbc5838df41a90c6dc2;p=packages%2Fnss.git

diff --git a/nss.spec b/nss.spec
index 376d3a9..34c5340 100644
--- a/nss.spec
+++ b/nss.spec
@@ -2,7 +2,7 @@
 Summary:	NSS - Network Security Services
 Summary(pl.UTF-8):	NSS - Network Security Services
 Name:		nss
-Version:	3.12
+Version:	3.12.6
 Release:	1
 Epoch:		1
 License:	MPL v1.1 or GPL v2+ or LGPL v2.1+
@@ -13,16 +13,21 @@ Group:		Libraries
 # :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot mozilla/security/nss -r NSS_3_9_4_RTM
 #Source0:	%{name}-%{version}.tar.bz2
 Source0:	http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_%{foover}_RTM/src/%{name}-%{version}.tar.gz
-# Source0-md5:	917f4e05f3982bd7fceaede197f0e1d4
+# Source0-md5:	da42596665f226de5eb3ecfc1ec57cd1
 Source1:	%{name}-mozilla-nss.pc
 Source2:	%{name}-config.in
+Source3:	http://www.cacert.org/certs/root.der
+# Source3-md5:	a61b375e390d9c3654eebd2031461f6b
 Patch0:		%{name}-Makefile.patch
 URL:		http://www.mozilla.org/projects/security/pki/nss/
-BuildRequires:	nspr-devel >= 1:4.7
+BuildRequires:	nspr-devel >= 1:4.7.4
+BuildRequires:	nss-tools
+BuildRequires:	perl-base
 BuildRequires:	sqlite3-devel
 BuildRequires:	zlib-devel
 BuildConflicts:	mozilla < 0.9.6-3
-Requires:	nspr >= 1:4.7
+Requires:	nspr >= 1:4.7.4
+Requires:	%{name}-softokn-freebl = %{epoch}:%{version}-%{release}
 Obsoletes:	libnss3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -60,7 +65,7 @@ Summary:	NSS - header files
 Summary(pl.UTF-8):	NSS - pliki nagłówkowe
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	nspr-devel >= 1:4.7
+Requires:	nspr-devel >= 1:4.7.4
 Obsoletes:	libnss3-devel
 
 %description devel
@@ -81,6 +86,17 @@ Static NSS Toolkit libraries.
 %description static -l pl.UTF-8
 Statyczne wersje bibliotek z NSS.
 
+%package softokn-freebl
+Summary:	Freebl library for the Network Security Services
+Summary(pl.UTF-8):	Biblioteka freebl dla bibliotek NSS
+Group:		Libraries
+
+%description softokn-freebl
+Freebl cryptographic library for the Network Security Services.
+
+%description softokn-freebl -l pl.UTF-8
+Biblioteka kryptograficzna freebl dla bibliotek NSS.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -93,11 +109,16 @@ sed -i -e '/export ADDON_PATH$/a\    echo STRIP \; %{__strip} --strip-unneeded -
 %build
 cd mozilla/security/nss
 
-%ifarch %{x8664} ppc64
+# http://wiki.cacert.org/wiki/NSSLib
+addbuiltin -n "CAcert Inc." -t "CT,C,C" < %{SOURCE3} >> lib/ckfw/builtins/certdata.txt
+%{__make} -C lib/ckfw/builtins generate
+
+%ifarch %{x8664} ppc64 sparc64
 export USE_64=1
 %endif
 
 %{__make} -j1 build_coreconf \
+	FREEBL_NO_DEPEND=1 \
 	NSDISTMODE=copy \
 	NS_USE_GCC=1 \
 	MOZILLA_CLIENT=1 \
@@ -108,6 +129,7 @@ export USE_64=1
 	OPTIMIZER="%{rpmcflags}"
 
 %{__make} -j1 build_dbm \
+	FREEBL_NO_DEPEND=1 \
 	NSDISTMODE=copy \
 	NS_USE_GCC=1 \
 	MOZILLA_CLIENT=1 \
@@ -119,6 +141,7 @@ export USE_64=1
 	PLATFORM="pld"
 
 %{__make} -j1 all \
+	FREEBL_NO_DEPEND=1 \
 	NSDISTMODE=copy \
 	NS_USE_GCC=1 \
 	MOZILLA_CLIENT=1 \
@@ -133,7 +156,7 @@ export USE_64=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_includedir}/nss,%{_libdir},%{_pkgconfigdir}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_includedir}/nss,/%{_lib},%{_libdir},%{_pkgconfigdir}}
 
 install mozilla/dist/private/nss/*	$RPM_BUILD_ROOT%{_includedir}/nss
 install mozilla/dist/public/dbm/*	$RPM_BUILD_ROOT%{_includedir}/nss
@@ -162,8 +185,10 @@ NSS_VPATCH=$(awk '/#define.*NSS_VPATCH/ {print $3}' mozilla/security/nss/lib/nss
 " %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/nss-config
 chmod +x $RPM_BUILD_ROOT%{_bindir}/nss-config
 
-# resolve conflict with squid
-mv -f $RPM_BUILD_ROOT%{_bindir}/{,nss-}client
+mv $RPM_BUILD_ROOT%{_libdir}/libfreebl3.so $RPM_BUILD_ROOT/%{_lib}
+ln -s /%{_lib}/libfreebl3.so $RPM_BUILD_ROOT%{_libdir}/libfreebl3.so
+mv $RPM_BUILD_ROOT%{_libdir}/libfreebl3.chk $RPM_BUILD_ROOT/%{_lib}
+ln -s /%{_lib}/libfreebl3.chk $RPM_BUILD_ROOT%{_libdir}/libfreebl3.chk
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -182,13 +207,14 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libsoftokn3.so
 %attr(755,root,root) %{_libdir}/libssl3.so
 %{_libdir}/libfreebl3.chk
+%{_libdir}/libnssdbm3.chk
 %{_libdir}/libsoftokn3.chk
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/nss-config
-%{_includedir}/nss
 %{_libdir}/libcrmf.a
+%{_includedir}/nss
 %{_pkgconfigdir}/mozilla-nss.pc
 %{_pkgconfigdir}/nss.pc
 
@@ -230,3 +256,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libsmime3.a
 %{_libdir}/libsoftokn3.a
 %{_libdir}/libssl3.a
+
+%files softokn-freebl
+%defattr(644,root,root,755)
+%attr(755,root,root) /%{_lib}/libfreebl3.so
+/%{_lib}/libfreebl3.chk