[nss] Temporarily requiring only nss_softokn_version >= 3.15.4

[Elio Maldonado]

commit 23d7297fce82dcecfe0e1dc5154b6d1d8f9e8ddc
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sun Feb 23 18:55:11 2014 -0800

    Temporarily requiring only nss_softokn_version >= 3.15.4
    
    - This until a koji build environment prprobmem which that causes i686 nss-softokn builds
    - to fail is resolved
    - nss-softokn-3.15.5 has the same code as nss-softokn-3.15.4

 nss.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/nss.spec b/nss.spec
index 4292260..b349055 100644
--- a/nss.spec
+++ b/nss.spec
@@ -1,6 +1,6 @@
 %global nspr_version 4.10.2
 %global nss_util_version 3.15.5
-%global nss_softokn_version 3.15.5
+%global nss_softokn_version 3.15.4
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 %global allTools "certutil cmsutil crlutil derdump modutil pk12util pp signtool signver ssltap vfychain vfyserv"
 
@@ -93,6 +93,8 @@ Patch49:          nss-skip-bltest-and-fipstest.patch
 # headers are older. Such is the case when starting an update with API changes or even private export changes.
 # Once the buildroot aha been bootstrapped the patch may be removed but it doesn't hurt to keep it.
 Patch50:          iquote.patch
+# Upstream: to be filed
+Patch51:          dont-disable-internal-module.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -181,6 +183,7 @@ low level services.
 %patch48 -p0 -b .crypto
 %patch49 -p0 -b .skipthem
 %patch50 -p0 -b .iquote
+%patch51 -p0 -b .segfault
 
 #########################################################
 # Higher-level libraries and test tools need access to
@@ -736,6 +739,7 @@ fi
 %changelog
 * Wed Feb 19 2014 Elio Maldonado <emaldona at redhat.com> - 3.15.5-1
 - Update to nss-3.15.5
+- Temporarily requiring only nss_softokn_version >= 3.15.4
 - Fix location of sharedb files and their manpages
 - Move cert9.db, key4.db, and pkcs11.txt to the main package
 - Move nss-sysinit manpages tar archives to the main package