X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=nss.spec;h=33b88466de813c27785605a3becd23ab39bd6b37;hb=48d344a;hp=d2d2596b3becb1000f3f73fa29fbe56fb7e03b12;hpb=12fcaeb15c11c732e0abe02df8e33ee5744f5188;p=packages%2Fnss.git

diff --git a/nss.spec b/nss.spec
index d2d2596..33b8846 100644
--- a/nss.spec
+++ b/nss.spec
@@ -1,15 +1,18 @@
-%define	nspr_ver	1:4.20
+# Conditional build:
+%bcond_with	tests		# enable tests
+
+%define	nspr_ver	1:4.28
 %define	foover	%(echo %{version} | tr . _)
 Summary:	NSS - Network Security Services
 Summary(pl.UTF-8):	NSS - Network Security Services
 Name:		nss
-Version:	3.41.1
+Version:	3.56
 Release:	1
 Epoch:		1
 License:	MPL v2.0
 Group:		Libraries
 Source0:	http://ftp.mozilla.org/pub/security/nss/releases/NSS_%{foover}_RTM/src/%{name}-%{version}.tar.gz
-# Source0-md5:	b89eafb7c960b11260a3ac30315cab01
+# Source0-md5:	ec4c24003069d28d5f9cc5c78a30cc5e
 Source1:	%{name}-mozilla-nss.pc
 Source2:	%{name}-config.in
 Source3:	http://www.cacert.org/certs/root.der
@@ -112,7 +115,7 @@ Biblioteka kryptograficzna freebl dla bibliotek NSS.
 # http://wiki.cacert.org/wiki/NSSLib
 addbuiltin -n "CAcert Inc." -t "CT,C,C" < %{SOURCE3} >> nss/lib/ckfw/builtins/certdata.txt
 
-%ifarch %{x8664} ppc64 sparc64
+%ifarch %{x8664} ppc64 sparc64 aarch64
 export USE_64=1
 %endif
 
@@ -133,6 +136,7 @@ export ZLIB_LIBS="-lz"
 %ifarch x32
 export USE_X32=1
 %endif
+%{!?with_tests:export NSS_DISABLE_GTESTS=1}
 
 # https://bugzilla.mozilla.org/show_bug.cgi?id=1084623
 
@@ -140,12 +144,12 @@ export USE_X32=1
 # Thus we also build noecc version (which doesn't require hack) and use these
 # libs from there.
 %{__sed} -i -e 's|#error|//error|g' ecc/nss/lib/freebl/ecl/ecl-curve.h
-%{__make} -j1 -C ecc/nss \
+%{__make} -C ecc/nss all \
 	NSS_ECC_MORE_THAN_SUITE_B=1 \
 	CC="%{__cc}" \
 	OPTIMIZER="%{rpmcflags} %{rpmcppflags}" \
 
-%{__make} -j1 -C noecc/nss \
+%{__make} -C noecc/nss all \
 	CC="%{__cc}" \
 	OPTIMIZER="%{rpmcflags} %{rpmcppflags}"
 
@@ -211,12 +215,18 @@ ln -s /%{_lib}/libfreeblpriv3.chk $RPM_BUILD_ROOT%{_libdir}/libfreeblpriv3.chk
 %{__mv} $RPM_BUILD_ROOT%{_libdir}/libssl{,3}.a
 
 # unit tests
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/{certdb,certhigh,cryptohi,der,pk11,softoken,ssl,util}_gtest
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/fbectest
+%if %{with tests}
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/{certdb,certhigh,cryptohi,der,pk11,softoken,smime,ssl,util}_gtest
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/nss_bogo_shim
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgtest*
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libpkcs11testmodule.*
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libcpputil.*
+%endif
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/fbectest
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/pk11ectest
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/pk11importtest
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/rsapoptst
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgtest*
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libnss*-testlib.so
 
 if [ ! -f "$RPM_BUILD_ROOT%{_includedir}/nss/nsslowhash.h" ]; then
 	echo >&2 "ERROR: %{_includedir}/nss/nsslowhash.h not installed. Needed by glibc"
@@ -250,7 +260,6 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/nss-config
-%{_libdir}/libcpputil.a
 %{_libdir}/libcrmf.a
 %{_libdir}/libfreebl.a
 %{_includedir}/nss