- up to 3.12.3

Changed files:
    nss-Makefile.patch -> 1.13
    nss.spec -> 1.89

diff --git a/nss-Makefile.patch b/nss-Makefile.patch
index d571b74fdf338b11363e0281817480abf3377c4c..1b73407a10fbaea95f26a56e8afb36572f91a53b 100644 (file)
--- a/nss-Makefile.patch
+++ b/nss-Makefile.patch
@@ -55,7 +55,9 @@ diff -Nur nss-3.11.orig/mozilla/security/coreconf/ruleset.mk nss-3.11/mozilla/se
  endif
  
  PKIXLIB = \
-@@ -161,30 +153,30 @@
+--- nss/mozilla/security/nss/cmd/platlibs.mk~  2009-05-10 22:23:08.330366552 +0200
++++ nss/mozilla/security/nss/cmd/platlibs.mk   2009-05-10 22:26:38.034387811 +0200
+@@ -159,29 +159,29 @@
        $(DIST)/lib/$(LIB_PREFIX)pkixcertsel.$(LIB_SUFFIX)
  
  EXTRA_LIBS += \
@@ -87,9 +89,7 @@ diff -Nur nss-3.11.orig/mozilla/security/coreconf/ruleset.mk nss-3.11/mozilla/se
        $(DIST)/lib/$(LIB_PREFIX)nssdev.$(LIB_SUFFIX) \
        $(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \
        $(CRYPTOLIB) \
--      $(DIST)/lib/$(LIB_PREFIX)nssutil.$(LIB_SUFFIX) \
-+      $(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \
-       $(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) \
+       $(DBMLIB) \
        $(PKIXLIB) \
 -      $(DIST)/lib/$(LIB_PREFIX)nss.$(LIB_SUFFIX) \
 -      $(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \

diff --git a/nss.spec b/nss.spec
index f2acb33bca680bd1d1053b581617e3189055b414..3e4ddd0aa77458b82d2925d79bb312d84464cd8a 100644 (file)
--- a/nss.spec
+++ b/nss.spec
@@ -2,8 +2,8 @@
 Summary:       NSS - Network Security Services
 Summary(pl.UTF-8):     NSS - Network Security Services
 Name:          nss
-Version:       3.12
-Release:       4
+Version:       3.12.3
+Release:       1
 Epoch:         1
 License:       MPL v1.1 or GPL v2+ or LGPL v2.1+
 Group:         Libraries
@@ -12,8 +12,8 @@ Group:                Libraries
 # :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot mozilla/security/coreconf -r NSS_3_9_4_RTM
 # :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot mozilla/security/nss -r NSS_3_9_4_RTM
 #Source0:      %{name}-%{version}.tar.bz2
-Source0:       http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_%{foover}_RTM/src/%{name}-%{version}.tar.gz
-# Source0-md5: 917f4e05f3982bd7fceaede197f0e1d4
+Source0:       http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_%{foover}_RTM/src/%{name}-%{version}.tar.bz2
+# Source0-md5: ecb7079ba4ebcf29b7716775384f1f18
 Source1:       %{name}-mozilla-nss.pc
 Source2:       %{name}-config.in
 Source3:       http://www.cacert.org/certs/root.der
@@ -169,9 +169,6 @@ NSS_VPATCH=$(awk '/#define.*NSS_VPATCH/ {print $3}' mozilla/security/nss/lib/nss
 " %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/nss-config
 chmod +x $RPM_BUILD_ROOT%{_bindir}/nss-config
 
-# resolve conflict with squid
-mv -f $RPM_BUILD_ROOT%{_bindir}/{,nss-}client
-
 %clean
 rm -rf $RPM_BUILD_ROOT