X-Git-Url: https://git.pld-linux.org/?p=packages%2Fnss.git;a=blobdiff_plain;f=nss.spec;h=ac5e9cbd40bfe5ded6316d52ffbee1659dc1e1c4;hp=10391c26125e69369a2886991c70fed5f964dbff;hb=5ed514d;hpb=36a64a0c71724fe0e9eeb92af2206bca7174cdd5

diff --git a/nss.spec b/nss.spec
index 10391c2..ac5e9cb 100644
--- a/nss.spec
+++ b/nss.spec
@@ -1,18 +1,19 @@
 # Conditional build:
+%bcond_with	bootstrap	# avoid dependency on nss-tools
 %bcond_with	tests		# enable tests
 
-%define	nspr_ver	1:4.25
+%define	nspr_ver	1:4.29
 %define	foover	%(echo %{version} | tr . _)
 Summary:	NSS - Network Security Services
 Summary(pl.UTF-8):	NSS - Network Security Services
 Name:		nss
-Version:	3.53.1
+Version:	3.61
 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:	bf604feb9be0a89eeca241ce82a95186
+# Source0-md5:	e07573e1c0e1e5bef7c05075f8dfa46d
 Source1:	%{name}-mozilla-nss.pc
 Source2:	%{name}-config.in
 Source3:	http://www.cacert.org/certs/root.der
@@ -21,7 +22,7 @@ Source4:	nss-softokn.pc.in
 # Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1083900
 URL:		https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS
 BuildRequires:	nspr-devel >= %{nspr_ver}
-BuildRequires:	nss-tools
+%{!?with_bootstrap:BuildRequires:	nss-tools}
 BuildRequires:	perl-base
 BuildRequires:	sqlite3-devel
 BuildRequires:	zlib-devel
@@ -112,8 +113,10 @@ Biblioteka kryptograficzna freebl dla bibliotek NSS.
 %endif
 
 %build
+%if %{without bootstrap}
 # http://wiki.cacert.org/wiki/NSSLib
 addbuiltin -n "CAcert Inc." -t "CT,C,C" < %{SOURCE3} >> nss/lib/ckfw/builtins/certdata.txt
+%endif
 
 %ifarch %{x8664} ppc64 sparc64 aarch64
 export USE_64=1
@@ -129,6 +132,7 @@ export BUILD_OPT=1
 export MOZILLA_CLIENT=1
 export NSDISTMODE=copy
 export NSPR_INCLUDE_DIR=/usr/include/nspr
+export NSS_ENABLE_WERROR=0
 export NSS_USE_SYSTEM_SQLITE=1
 export USE_PTHREADS=1
 export USE_SYSTEM_ZLIB=1
@@ -148,10 +152,14 @@ export USE_X32=1
 	NSS_ECC_MORE_THAN_SUITE_B=1 \
 	CC="%{__cc}" \
 	OPTIMIZER="%{rpmcflags} %{rpmcppflags}" \
+	OS_TEST="%{_target_cpu}" \
+	NS_USE_GCC=1
 
 %{__make} -C noecc/nss all \
 	CC="%{__cc}" \
-	OPTIMIZER="%{rpmcflags} %{rpmcppflags}"
+	OPTIMIZER="%{rpmcflags} %{rpmcppflags}" \
+	OS_TEST="%{_target_cpu}" \
+	NS_USE_GCC=1
 
 %install
 rm -rf $RPM_BUILD_ROOT