rpms/nss/F-11 nss.spec,1.68,1.69

[Kai Engert]

Author: kengert

Update of /cvs/extras/rpms/nss/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20943

Modified Files:
	nss.spec 
Log Message:
* Fri Jun 05 2009 Kai Engert <kaie at redhat.com> - 3.12.3.99.3-2
- reenable test suite



Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/F-11/nss.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- nss.spec	5 Jun 2009 02:29:21 -0000	1.68
+++ nss.spec	5 Jun 2009 04:35:26 -0000	1.69
@@ -4,7 +4,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.3.99.3
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -29,6 +29,8 @@ Source4:          blank-key3.db
 Source5:          blank-secmod.db
 Source8:          nss-prelink.conf
 Source12:         %{name}-pem-20080124.tar.bz2
+Source13:         PayPalEE.cert
+Source14:         PayPalICA.cert
 
 Patch1:           nss-no-rpath.patch
 Patch2:           nss-nolocalsql.patch
@@ -107,6 +109,10 @@ low level services.
 %patch5 -p0 -b .429175
 %patch6 -p0 -b .libpem
 
+#need newer certs to make test suite work
+#remove once we update to NSS 3.12.4
+cp %{SOURCE13} %{SOURCE14} mozilla/security/nss/tests/libpkix/certs
+
 
 %build
 
@@ -213,21 +219,20 @@ find ./mozilla/security/nss/tests -type 
 
 killall $RANDSERV || :
 
-#temporarily disable the test suite because of bug 494266
-#rm -rf ./mozilla/tests_results
-#cd ./mozilla/security/nss/tests/
-## all.sh is the test suite script
-#HOST=localhost DOMSUF=localdomain PORT=$MYRAND ./all.sh
-#cd ../../../../
-
-#killall $RANDSERV || :
-
-#TEST_FAILURES=`grep -c FAILED ./mozilla/tests_results/security/localhost.1/output.log` || :
-#if [ $TEST_FAILURES -ne 0 ]; then
-#  echo "error: test suite returned failure(s)"
-#  exit 1
-#fi
-#echo "test suite completed"
+rm -rf ./mozilla/tests_results
+cd ./mozilla/security/nss/tests/
+# all.sh is the test suite script
+HOST=localhost DOMSUF=localdomain PORT=$MYRAND ./all.sh
+cd ../../../../
+
+killall $RANDSERV || :
+
+TEST_FAILURES=`grep -c FAILED ./mozilla/tests_results/security/localhost.1/output.log` || :
+if [ $TEST_FAILURES -ne 0 ]; then
+  echo "error: test suite returned failure(s)"
+  exit 1
+fi
+echo "test suite completed"
 
 # Produce .chk files for the final stripped binaries
 %define __spec_install_post \
@@ -473,6 +478,8 @@ done
 
 
 %changelog
+* Fri Jun 05 2009 Kai Engert <kaie at redhat.com> - 3.12.3.99.3-2
+- reenable test suite
 * Fri Jun 05 2009 Kai Engert <kaie at redhat.com> - 3.12.3.99.3-1
 - updated to NSS_3_12_4_FIPS1_WITH_CKBI_1_75
 * Fri May 08 2009 Kai Engert <kaie at redhat.com> - 3.12.3-4