diff --git a/.cvsignore b/.cvsignore index ea3db0e..652c679 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ nss-pem-20080124.tar.bz2 -nss-3.12.0.3-stripped.tar.bz2 +nss-3.12.1.0-stripped.tar.bz2 diff --git a/nss-fix-tests.patch b/nss-fix-tests.patch deleted file mode 100644 index ae7dc68..0000000 --- a/nss-fix-tests.patch +++ /dev/null @@ -1,18 +0,0 @@ -? mozilla/security/nss/tests/mylog -? mozilla/security/nss/tests/cert/mylog -? mozilla/security/nss/tests/fips/mylog -Index: mozilla/security/nss/tests/common/init.sh -=================================================================== -RCS file: /cvsroot/mozilla/security/nss/tests/common/init.sh,v -retrieving revision 1.63 -diff -u -u -r1.63 init.sh ---- mozilla/security/nss/tests/common/init.sh 4 Apr 2008 07:39:05 -0000 1.63 -+++ mozilla/security/nss/tests/common/init.sh 11 Jun 2008 15:53:21 -0000 -@@ -265,6 +265,7 @@ - MAKE=gmake - $MAKE -v >/dev/null 2>&1 || MAKE=make - $MAKE -v >/dev/null 2>&1 || { echo "You are missing make."; exit 5; } -+ MAKE="$MAKE --no-print-directory" - - DIST=${DIST-${MOZILLA_ROOT}/dist} - SECURITY_ROOT=${SECURITY_ROOT-${MOZILLA_ROOT}/security/nss} diff --git a/nss.spec b/nss.spec index 823d40e..375d3f0 100644 --- a/nss.spec +++ b/nss.spec @@ -3,8 +3,8 @@ Summary: Network Security Services Name: nss -Version: 3.12.0.3 -Release: 7%{?dist} +Version: 3.12.1.0 +Release: 2%{?dist} License: MPLv1.1 or GPLv2+ or LGPLv2+ URL: http://www.mozilla.org/projects/security/pki/nss/ Group: System Environment/Libraries @@ -33,7 +33,6 @@ Patch1: nss-no-rpath.patch Patch2: nss-nolocalsql.patch Patch5: nss-pem-bug429175.patch Patch6: nss-enable-pem.patch -patch7: nss-fix-tests.patch %description Network Security Services (NSS) is a set of libraries designed to @@ -87,7 +86,6 @@ low level services. %patch2 -p0 %patch5 -p0 -b .429175 %patch6 -p0 -b .libpem -%patch7 -p0 -b .prex %build @@ -444,6 +442,8 @@ done %changelog +* Fri Aug 22 2008 Kai Engert - 3.12.1.0-2 +- NSS 3.12.1 RC1 * Fri Aug 15 2008 Kai Engert - 3.12.0.3-7 - fix bug bug 429175 in libpem module * Tue Aug 05 2008 Kai Engert - 3.12.0.3-6 diff --git a/sources b/sources index 24f27fd..6dac82f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 084675e4f793ed82e1ba78f76745ada8 nss-pem-20080124.tar.bz2 -3cd51c37fd84d5c56cdd2bf807d16625 nss-3.12.0.3-stripped.tar.bz2 +ad0cb75c59fb65b35dcd24d726d77372 nss-3.12.1.0-stripped.tar.bz2