up to 3.33

[packages/nss.git] / nss.spec

diff --git a/nss.spec b/nss.spec
index 99cb519e839101f479c9466b14b0bc797e49caf6..86db8113e0d13112f46f1f80a9a1df22dcb29eed 100644 (file)
--- a/nss.spec
+++ b/nss.spec
@@ -1,15 +1,15 @@
-%define        nspr_ver        1:4.13
+%define        nspr_ver        1:4.17
 %define        foover  %(echo %{version} | tr . _)
 Summary:       NSS - Network Security Services
 Summary(pl.UTF-8):     NSS - Network Security Services
 Name:          nss
-Version:       3.27.2
+Version:       3.33
 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: ed089d28a3c593f8ba4ac26ad9984a75
+# Source0-md5: 43663c850e2b2ed48ecb8910b055f5a9
 Source1:       %{name}-mozilla-nss.pc
 Source2:       %{name}-config.in
 Source3:       http://www.cacert.org/certs/root.der
@@ -27,6 +27,12 @@ BuildConflicts:      mozilla < 0.9.6-3
 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 < 50.1.0-2
+Conflicts:     iceape < 2.46-1
+Conflicts:     iceweasel < 51
+Conflicts:     mozilla-firefox < 51
+Conflicts:     seamonkey < 2.47
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                specflags       -fno-strict-aliasing
@@ -207,13 +213,10 @@ 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}/ectest
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/gtests
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/{certdb,certhigh,der,pk11,ssl,util}_gtest
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/fbectest
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/nss_bogo_shim
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/pk11_gtest
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/ssl_gtest
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/util_gtest
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/pk11ectest
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libgtest*
 
 if [ ! -f "$RPM_BUILD_ROOT%{_includedir}/nss/nsslowhash.h" ]; then
@@ -248,6 +251,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