X-Git-Url: https://git.pld-linux.org/?p=packages%2Fnss.git;a=blobdiff_plain;f=nss.spec;h=9d6102a31b231eaed1c897373935faf90896f494;hp=bb8dea5e11532838cb9750d6932f1191826d63e4;hb=HEAD;hpb=7252b2f6baaee52a458b21f1b8c984b148af3551

diff --git a/nss.spec b/nss.spec
index bb8dea5..918f1ff 100644
--- a/nss.spec
+++ b/nss.spec
@@ -2,18 +2,18 @@
 %bcond_with	bootstrap	# avoid dependency on nss-tools
 %bcond_with	tests		# enable tests
 
-%define	nspr_ver	1:4.32
+%define	nspr_ver	1:4.35
 %define	foover	%(echo %{version} | tr . _)
 Summary:	NSS - Network Security Services
 Summary(pl.UTF-8):	NSS - Network Security Services
 Name:		nss
-Version:	3.75
+Version:	3.100
 Release:	1
 Epoch:		1
 License:	MPL v2.0
 Group:		Libraries
 Source0:	https://ftp.mozilla.org/pub/security/nss/releases/NSS_%{foover}_RTM/src/%{name}-%{version}.tar.gz
-# Source0-md5:	1a6ecb5ed5eb00c3c50eda15116b45fb
+# Source0-md5:	91d114f373c71ed04c4fca96958cdcd1
 Source1:	%{name}-mozilla-nss.pc
 Source2:	%{name}-config.in
 Source3:	https://www.cacert.org/certs/root.der
@@ -27,8 +27,8 @@ BuildRequires:	perl-base
 BuildRequires:	sqlite3-devel
 BuildRequires:	zlib-devel
 BuildConflicts:	mozilla < 0.9.6-3
-Requires:	%{name}-softokn-freebl = %{epoch}:%{version}-%{release}
-Requires:	nspr >= %{nspr_ver}
+Requires:	%{name}-softokn-freebl%{?_isa} = %{epoch}:%{version}-%{release}
+Requires:	nspr%{?_isa} >= %{nspr_ver}
 Obsoletes:	libnss3
 # needs http2 code update: https://bugzilla.mozilla.org/show_bug.cgi?id=1323209
 Conflicts:	firefox < 50.1.0-2
@@ -39,8 +39,9 @@ Conflicts:	seamonkey < 2.47
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		specflags	-fno-strict-aliasing
+%define		signedlibs	libfreebl3.so libfreeblpriv3.so libnssdbm3.so libsoftokn3.so
 # signed -  stripped before signing
-%define		_noautostrip	.*%{_libdir}/libfreebl3.so\\|.*%{_libdir}/libsoftokn3.so
+%define		_noautostrip	.*%{_lib}/\\(%(echo %{signedlibs} | sed 's/ /\\\\|/g')\\)
 %define		_noautochrpath	.*%{_libdir}/libfreebl3.so\\|.*%{_libdir}/libsoftokn3.so
 
 %description
@@ -59,7 +60,7 @@ i wiele innych bezpiecznych standardów.
 Summary:	NSS command line tools and utilities
 Summary(pl.UTF-8):	Narzędzia NSS obsługiwane z linii poleceń
 Group:		Applications
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name}%{?_isa} = %{epoch}:%{version}-%{release}
 
 %description tools
 The NSS Toolkit command line tool.
@@ -71,7 +72,7 @@ Narzędzia NSS obsługiwane z linii poleceń.
 Summary:	NSS - header files
 Summary(pl.UTF-8):	NSS - pliki nagłówkowe
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name}%{?_isa} = %{epoch}:%{version}-%{release}
 Requires:	nspr-devel >= %{nspr_ver}
 Obsoletes:	libnss3-devel
 
@@ -107,10 +108,11 @@ Biblioteka kryptograficzna freebl dla bibliotek NSS.
 %prep
 %setup -q
 
-%if 0%{!?debug:1}
-# strip before signing
-%{__sed} -i -e '/export ADDON_PATH$/a\    echo STRIP \; %{__strip} --strip-unneeded -R.comment -R.note ${5}' nss/cmd/shlibsign/sign.sh
-%endif
+# http://pki.fedoraproject.org/wiki/ECC_Capable_NSS
+for dir in ecc noecc; do
+	install -d $dir
+	cp -a nss $dir
+done
 
 %build
 %if %{without bootstrap}
@@ -122,12 +124,6 @@ addbuiltin -n "CAcert Inc." -t "CT,C,C" < %{SOURCE3} >> nss/lib/ckfw/builtins/ce
 export USE_64=1
 %endif
 
-# http://pki.fedoraproject.org/wiki/ECC_Capable_NSS
-for dir in ecc noecc; do
-	install -d $dir
-	cp -a nss $dir/nss
-done
-
 export BUILD_OPT=1
 export MOZILLA_CLIENT=1
 export NSDISTMODE=copy
@@ -161,6 +157,17 @@ export USE_X32=1
 	OS_TEST="%{_target_cpu}" \
 	NS_USE_GCC=1
 
+# strip and sign again
+%{__strip} --strip-unneeded -R.comment -R.note \
+	{,no}ecc/dist/Linux*/lib/{%(echo %{signedlibs} | tr ' ' ',')}
+
+for dir in ecc noecc; do
+	distdir=$(echo $(pwd)/$dir/dist/Linux*)
+	for lib in %{signedlibs}; do
+		LD_LIBRARY_PATH="$distdir/lib" "$distdir/bin/shlibsign" -i "$distdir/lib/$lib"
+	done
+done
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_includedir}/nss,/%{_lib},%{_libdir},%{_pkgconfigdir}}
@@ -290,6 +297,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/crlutil
 %attr(755,root,root) %{_bindir}/crmftest
 %attr(755,root,root) %{_bindir}/dbtest
+%attr(755,root,root) %{_bindir}/dbtool
 %attr(755,root,root) %{_bindir}/derdump
 %attr(755,root,root) %{_bindir}/dertimetest
 %attr(755,root,root) %{_bindir}/digest