- updated to 3.11, updated Makefile patch, removed obsolete system-zlib,dbm patches

Changed files:
    nss.spec -> 1.59

diff --git a/nss.spec b/nss.spec
index d7b2162174619a427bd9548f6b03f70d4f028f6f..2fbffa48e8a1cab888cbb44ab3159e1892762cec 100644 (file)
--- a/nss.spec
+++ b/nss.spec
@@ -1,7 +1,7 @@
 Summary:       NSS - Network Security Services
 Summary(pl):   NSS - Network Security Services
 Name:          nss
-Version:       3.10
+Version:       3.11
 %define        foover  %(echo %{version} | tr . _)
 Release:       1
 Epoch:         1
@@ -12,14 +12,10 @@ 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: bd58f762f1b352910901f11823e67b97
+Source0:       ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_%{foover}_RTM/src/%{name}-%{version}.tar.gz
+# Source0-md5: 9be73bd73e361e5e36edf77f456fa20a
 Source1:       %{name}-mozilla-nss.pc
 Patch0:                %{name}-Makefile.patch
-Patch1:                %{name}-system-zlib.patch
-# missing files
-# (:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot mozilla/security/dbm -r NSS_3_10_RTM)
-Patch2:                %{name}-dbm.patch
 BuildRequires: nspr-devel >= 4.4.1
 BuildRequires: zip >= 2.1
 BuildConflicts:        mozilla < 0.9.6-3
@@ -79,8 +75,6 @@ Statyczne wersje bibliotek z NSS.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 cd mozilla/security/nss
@@ -111,6 +105,8 @@ cd mozilla/security/nss
        NO_MDUPDATE=1 \
        USE_PTHREADS=1 \
        BUILD_OPT=1 \
+       USE_SYSTEM_ZLIB=1 \
+       ZLIB_LIBS="-lz" \
        OPTIMIZER="%{rpmcflags}" \
        PLATFORM="pld"