[nss-softokn] Require nspr-4.10 or greater

[Elio Maldonado]

commit 28f313aaeb9a9c29be90d338d1ce90311a178649
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Mon Jun 17 11:26:39 2013 -0700

    Require nspr-4.10 or greater
    
    - Fix patch to select tests to run

 build-nss-softoken-only.patch   |    2 +-
 nss-softokn.spec                |   12 ++++++++++--
 nss-versus-softoken-tests.patch |   38 +++++++++++++++++---------------------
 3 files changed, 28 insertions(+), 24 deletions(-)
---
diff --git a/build-nss-softoken-only.patch b/build-nss-softoken-only.patch
index c2f5089..5f1b271 100644
--- a/build-nss-softoken-only.patch
+++ b/build-nss-softoken-only.patch
@@ -6,7 +6,7 @@ diff -up nss/lib/Makefile.softokenonly nss/lib/Makefile
  SOFTOKEN_SRCDIR =
  else
 +ifeq ($(NSS_BUILD_SOFTOKEN_ONLY),1)
-+SOFTOKEN_SRCDIR =
++UTIL_SRCDIR =util
 +FREEBL_SRCDIR = freebl
 +SOFTOKEN_SRCDIR = softoken
  # default is to include all
diff --git a/nss-softokn.spec b/nss-softokn.spec
index d9497be..c4683e8 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -1,4 +1,4 @@
-%global nspr_version 4.9.5
+%global nspr_version 4.10
 %global nss_name nss
 %global nss_util_version 3.15
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
@@ -25,7 +25,7 @@
 Summary:          Network Security Services Softoken Module
 Name:             nss-softokn
 Version:          3.15
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          MPLv2.0
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -246,6 +246,10 @@ export BUILD_OPT
 USE_64=1
 export USE_64
 %endif
+
+# to test for the last tool built correctly
+export NSS_BUILD_SOFTOKEN_ONLY=1
+
 # End -- copied from the build section
 
 # enable the following line to force a test failure
@@ -386,6 +390,10 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Mon Jun 17 2013 Elio Maldonado <emaldona at redhat.com> - 3.15-3
+- Require nspr-4.10 or greater
+- Fix patch to select tests to run
+
 * Thu Jun 13 2013 Elio Maldonado <emaldona at redhat.com> - 3.15-2
 - Select the tests suite to run based on the build type
 
diff --git a/nss-versus-softoken-tests.patch b/nss-versus-softoken-tests.patch
index dcf0693..40b1808 100644
--- a/nss-versus-softoken-tests.patch
+++ b/nss-versus-softoken-tests.patch
@@ -1,30 +1,26 @@
-diff -up nss/tests/all.sh.crypto nss/tests/all.sh
---- nss/tests/all.sh.crypto	2013-05-28 14:43:24.000000000 -0700
-+++ nss/tests/all.sh	2013-05-30 22:50:36.914426032 -0700
-@@ -294,14 +294,15 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOU
-     . ./init.sh
- fi
- 
-+ The last file created depends on the type of build that we did
-+last_built = [ -n ${NSS_BUILD_SOFTOKEN_ONLY} ] && shlibsign || modutil
- # NOTE:
--# Since in make at the top level, modutil is the last file
--# created, we check for modutil to know whether the build
-+# Since in make at the top level, last_built is the last file
-+# created, we check for last_built to know whether the build
+diff -up nss/tests/all.sh.cryptotests nss/tests/all.sh
+--- nss/tests/all.sh.cryptotests	2013-05-28 14:43:24.000000000 -0700
++++ nss/tests/all.sh	2013-06-17 11:11:49.626902227 -0700
+@@ -299,9 +299,13 @@ fi
+ # created, we check for modutil to know whether the build
  # is complete. If a new file is created after that, the 
--# following test for modutil should check for that instead.
-+# following test for should check for the one instead.
- 
+ # following test for modutil should check for that instead.
+-
 -if [ ! -f ${DIST}/${OBJDIR}/bin/modutil -a  \
 -     ! -f ${DIST}/${OBJDIR}/bin/modutil.exe ]; then
-+if [ ! -f ${DIST}/${OBJDIR}/bin/${last_built}${PROG_SUFFIX} -a ]; then
++# Except when building softoken only where shlibsign is the last one built.
++if [ "${NSS_BUILD_SOFTOKEN_ONLY}" -eq "1" ]; then
++    LAST_BUILT=shlibsign || modutil
++else
++    LAST_BUILT=modutil
++fi
++if [ ! -x ${DIST}/${OBJDIR}/bin/${LAST_BUILT}${PROG_SUFFIX} ]; then
      echo "Build Incomplete. Aborting test." >> ${LOGFILE}
      html_head "Testing Initialization"
      Exit "Checking for build"
-diff -up nss/tests/cipher/cipher.sh.crypto nss/tests/cipher/cipher.sh
---- nss/tests/cipher/cipher.sh.crypto	2013-05-28 14:43:24.000000000 -0700
-+++ nss/tests/cipher/cipher.sh	2013-05-30 22:56:46.084300872 -0700
+diff -up nss/tests/cipher/cipher.sh.cryptotests nss/tests/cipher/cipher.sh
+--- nss/tests/cipher/cipher.sh.cryptotests	2013-05-28 14:43:24.000000000 -0700
++++ nss/tests/cipher/cipher.sh	2013-06-17 11:10:18.946049972 -0700
 @@ -129,6 +129,16 @@ if [ ! -x ${DIST}/${OBJDIR}/bin/bltest${
      return 0
  fi