[nss-softokn/f16] - Update to NSS_3_13_1_RTM

[Elio Maldonado]

commit 5be636d13cd8b1bfe7594a102481df9158d6a2b6
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Thu Nov 3 17:48:03 2011 -0700

    - Update to NSS_3_13_1_RTM
    
    - Cherry-picking from master

 .gitignore       |    2 +-
 bz709517.patch   |   14 --------------
 nss-softokn.spec |   23 ++++++++++++-----------
 sources          |    2 +-
 4 files changed, 14 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8fd0adf..2c62a64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-nss-softokn-3.12.10-stripped.tar.bz2
+nss-softokn-3.13.1-stripped.tar.bz2
diff --git a/nss-softokn.spec b/nss-softokn.spec
index e920500..9c730e1 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -1,6 +1,6 @@
-%global nspr_version 4.8.8
+%global nspr_version 4.8.9
 %global nss_name nss
-%global nss_util_version 3.12.10
+%global nss_util_version 3.13.1
 %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.12.10
-Release:          6%{?dist}
+Version:          3.13.1
+Release:          1%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -52,7 +52,6 @@ Source3:          nss-softokn-config.in
 # FIPS 140 -- update this patch as we rebase nss
 # and remov it once it has been included upstream
 Patch2:           nss-softokn-3.12.4-prelink.patch
-Patch3:           bz709517.patch
 Patch4:           softoken-minimal-test-dependencies.patch
 
 %description
@@ -176,8 +175,8 @@ SOFTOKEN_VMAJOR=`cat mozilla/security/nss/lib/softoken/softkver.h | grep "#defin
 SOFTOKEN_VMINOR=`cat mozilla/security/nss/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VMINOR" | awk '{print $3}'`
 SOFTOKEN_VPATCH=`cat mozilla/security/nss/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VPATCH" | awk '{print $3}'`
 
-export SOFTOKEN_VMAJOR 
-export SOFTOKEN_VMINOR 
+export SOFTOKEN_VMAJOR
+export SOFTOKEN_VMINOR
 export SOFTOKEN_VPATCH
 
 %{__cat} %{SOURCE3} | sed -e "s, at libdir@,%{_libdir},g" \
@@ -316,15 +315,14 @@ done
 %{__install} -p -m 644 ./mozilla/dist/pkgconfig/nss-softokn.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss-softokn.pc
 %{__install} -p -m 755 ./mozilla/dist/pkgconfig/nss-softokn-config $RPM_BUILD_ROOT/%{_bindir}/nss-softokn-config
 
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
 
-%post
-/sbin/ldconfig >/dev/null 2>/dev/null
+%post -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig >/dev/null 2>/dev/null
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
@@ -377,6 +375,9 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Tue Nov 08 2011 Elio Maldonado <emaldona at redhat.com> - 3.13.1-1
+- Update to NSS_3_13_1_RTM
+
 * Wed Oct 12 2011 Elio Maldonado <emaldona at redhat.com> - 3.12.10-6
 - Fix failure to switch nss-softokn to FIPS mode (#745571)
 
diff --git a/sources b/sources
index 156181a..ce78c5c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ea4add0e1baca430842f781b80f7bdda  nss-softokn-3.12.10-stripped.tar.bz2
+3daa76bcd96fa425dc7efaab6989faa5  nss-softokn-3.13.1-stripped.tar.bz2