up to 3.37.1

[packages/nss.git] / nss.spec

diff --git a/nss.spec b/nss.spec
index e99c1d8a91f1a06e443662d7a7bb751a29763e62..52b8d54305bc4d96cc379dce86c231f2241a0f5d 100644 (file)
--- a/nss.spec
+++ b/nss.spec
@@ -1,22 +1,21 @@
-%define        nspr_ver        1:4.13.1
+%define        nspr_ver        1:4.19
 %define        foover  %(echo %{version} | tr . _)
 Summary:       NSS - Network Security Services
 Summary(pl.UTF-8):     NSS - Network Security Services
 Name:          nss
-Version:       3.28.1
-Release:       0.1
+Version:       3.37.1
+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: e98d48435cee5792f97ef7fc35a602c3
+# Source0-md5: e9526d7217d02afa96b90b89924c38df
 Source1:       %{name}-mozilla-nss.pc
 Source2:       %{name}-config.in
 Source3:       http://www.cacert.org/certs/root.der
 # Source3-md5: a61b375e390d9c3654eebd2031461f6b
 Source4:       nss-softokn.pc.in
 # Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1083900
-Patch0:                x32.patch
 URL:           https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS
 BuildRequires: nspr-devel >= %{nspr_ver}
 BuildRequires: nss-tools
@@ -28,8 +27,8 @@ Requires:     %{name}-softokn-freebl = %{epoch}:%{version}-%{release}
 Requires:      nspr >= %{nspr_ver}
 Obsoletes:     libnss3
 # needs http2 code update: https://bugzilla.mozilla.org/show_bug.cgi?id=1323209
-Conflicts:     firefox < 51
-Conflicts:     iceape < 2.47
+Conflicts:     firefox < 50.1.0-2
+Conflicts:     iceape < 2.46-1
 Conflicts:     iceweasel < 51
 Conflicts:     mozilla-firefox < 51
 Conflicts:     seamonkey < 2.47
@@ -103,7 +102,6 @@ Biblioteka kryptograficzna freebl dla bibliotek NSS.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %if 0%{!?debug:1}
 # strip before signing
@@ -213,14 +211,11 @@ 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}/der_gtest
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/{certdb,certhigh,cryptohi,der,pk11,softoken,ssl,util}_gtest
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/fbectest
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/gtests
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/nss_bogo_shim
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/pk11_gtest
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/pk11ectest
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/ssl_gtest
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/util_gtest
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/rsapoptst
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libgtest*
 
 if [ ! -f "$RPM_BUILD_ROOT%{_includedir}/nss/nsslowhash.h" ]; then
@@ -255,6 +250,7 @@ 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
@@ -269,7 +265,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/baddbdir
 %attr(755,root,root) %{_bindir}/bltest
 %attr(755,root,root) %{_bindir}/btoa
-%attr(755,root,root) %{_bindir}/certcgi
 %attr(755,root,root) %{_bindir}/certutil
 %attr(755,root,root) %{_bindir}/chktest
 %attr(755,root,root) %{_bindir}/cmsutil