[nss-softokn] Update to NSS_3_13_5_RTM

[Elio Maldonado]

commit 068c75f4cebfd43b188026d7ca38be65ea9f6e30
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Mon Jun 18 08:18:34 2012 -0700

    Update to NSS_3_13_5_RTM
    
    - Remove unneeded fix for gcc 4.7 c++ issue in secmodt.h which undoes the upstream fix
    - Fix Libs: line on nss-softokn.pc.in

 .gitignore        |    2 +-
 nss-softokn.pc.in |    2 +-
 nss-softokn.spec  |   17 +++++++++--------
 sources           |    2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8443d70..7049fd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/nss-softokn-3.13.4-stripped.tar.bz2
+/nss-softokn-3.13.5-stripped.tar.bz2
diff --git a/nss-softokn.pc.in b/nss-softokn.pc.in
index 022ebbf..572c6a6 100644
--- a/nss-softokn.pc.in
+++ b/nss-softokn.pc.in
@@ -7,5 +7,5 @@ Name: NSS-SOFTOKN
 Description: Network Security Services Softoken PKCS #11 Module
 Version: %SOFTOKEN_VERSION%
 Requires: nspr >= %NSPR_VERSION%, nss-util >= %NSSUTIL_VERSION%
-Libs: -L${libdir} -lfreebl3 -lnssdbm3 -lsoftokn3
+Libs: -L${libdir}/nss3 -lfreebl3 -lnssdbm3 -lsoftokn3
 Cflags: -I${includedir}
diff --git a/nss-softokn.spec b/nss-softokn.spec
index 40b3309..6615967 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -1,6 +1,6 @@
-%global nspr_version 4.9
+%global nspr_version 4.9.1
 %global nss_name nss
-%global nss_util_version 3.13.4
+%global nss_util_version 3.13.5
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 %global saved_files_dir %{_libdir}/nss/saved
 
@@ -16,8 +16,8 @@
 
 Summary:          Network Security Services Softoken Module
 Name:             nss-softokn
-Version:          3.13.4
-Release:          3%{?dist}
+Version:          3.13.5
+Release:          1%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -70,9 +70,6 @@ Patch8:           softoken-minimal-test-dependencies.patch
 # NSSUTIL_INCLUDE_DIR, after all, contains both util and freebl headers. 
 # Once has been bootstapped the patch may be removed, but it doesn't hurt to keep it.
 Patch9:           iquote.patch
-# Fix gcc 4.7 c++ issue in secmodt.h
-# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50917
-Patch10:          nss-softokn-fix-gcc47-secmodt.patch
 
 # Upstream bug numbers:
 # https://bugzilla.mozilla.org/show_bug.cgi?id=679814
@@ -137,7 +134,6 @@ Header and library files for doing development with Network Security Services.
 %patch8 -p0 -b .crypto
 # activate if needed when doing a major update with new apis
 #%patch9 -p0 -b .iquote
-%patch10 -p0 -b .gcc47
 %patch11 -p0 -b .801975
 %patch12 -p0 -b .745224
 
@@ -400,6 +396,11 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Mon Jun 18 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.5-1
+- Update to NSS_3_13_5_RTM
+- Remove unneeded fix for gcc 4.7 c++ issue in secmodt.h which undoes the upstream fix
+- Fix Libs: line on nss-softokn.pc.in
+
 * Wed Jun 13 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.4-3
 - Resolves: rhbz#745224 - nss-softokn sha224 self-test fails in fips mode
 
diff --git a/sources b/sources
index a9e4773..be18886 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3d5704a383dbed469c0864afeac70fd2  nss-softokn-3.13.4-stripped.tar.bz2
+6538775aaa70915344965ba49cbe4450  nss-softokn-3.13.5-stripped.tar.bz2