[nss/f17] Update to NSS_3_13_5_RTM

[Elio Maldonado]

commit 1ca4396f927b774a0f903ccd9e5919201dbc5af5
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sun Jul 1 11:12:23 2012 -0700

    Update to NSS_3_13_5_RTM
    
    - Resolves: Bug 830410 - Missing Requires %{?_isa}
    - Use Requires: %{name}%{?_isa} = %{version}-%{release} on tools
    - Drop zlib requires which rpmlint reports as error E: explicit-lib-dependency zlib
    - Enable sha224 portion of powerup selftest when running test suites
    - Require nspr 4.9.1
    - Selective merge from master

 .gitignore |    2 +-
 nss.pc.in  |    2 +-
 nss.spec   |   24 +++++++++++++++---------
 sources    |    2 +-
 4 files changed, 18 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b5ff2c8..64a2e0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,5 @@ blank-secmod.db
 blank-cert9.db
 blank-key4.db
 PayPalEE.cert
-/nss-3.13.4-stripped.tar.bz2
+/nss-3.13.5-stripped.tar.bz2
 /nss-pem-20120402.tar.bz2
diff --git a/nss.pc.in b/nss.pc.in
index d23d15a..69823cb 100644
--- a/nss.pc.in
+++ b/nss.pc.in
@@ -7,5 +7,5 @@ Name: NSS
 Description: Network Security Services
 Version: %NSS_VERSION%
 Requires: nspr >= %NSPR_VERSION%, nss-util >= %NSSUTIL_VERSION%
-Libs: -lssl3 -lsmime3 -lnss3
+Libs: -L${libdir} -lssl3 -lsmime3 -lnss3
 Cflags: -I${includedir}
diff --git a/nss.spec b/nss.spec
index bc97b04..cfd8f93 100644
--- a/nss.spec
+++ b/nss.spec
@@ -1,13 +1,13 @@
-%global nspr_version 4.9
-%global nss_util_version 3.13.4
+%global nspr_version 4.9.1
+%global nss_util_version 3.13.5
 %global nss_softokn_fips_version 3.12.9
-%global nss_softokn_version 3.13.4
+%global nss_softokn_version 3.13.5
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 
 Summary:          Network Security Services
 Name:             nss
-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
@@ -92,8 +92,7 @@ v3 certificates, and other security standards.
 %package tools
 Summary:          Tools for the Network Security Services
 Group:            System Environment/Base
-Requires:         nss = %{version}-%{release}
-Requires:         zlib
+Requires:         %{name}%{?_isa} = %{version}-%{release}
 
 %description tools
 Network Security Services (NSS) is a set of libraries designed to
@@ -203,8 +202,6 @@ export NSPR_LIB_DIR
 export FREEBL_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nss-softokn | sed 's/-I//'`
 export FREEBL_LIB_DIR=%{_libdir}
 export USE_SYSTEM_FREEBL=1
-# prevents running the sha224 portion of the powerup selftest when testing
-export NO_SHA224_AVAILABLE=1
 
 NSS_USE_SYSTEM_SQLITE=1
 export NSS_USE_SYSTEM_SQLITE
@@ -583,6 +580,15 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
 
 
 %changelog
+* Sun Jul 01 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.5-1
+- Update to NSS_3_13_5_RTM
+- Resolves: Bug 830410 - Missing Requires %%{?_isa}
+- Use Requires: %%{name}%%{?_isa} = %%{version}-%%{release} on tools
+- Drop zlib requires which rpmlint reports as error E: explicit-lib-dependency zlib
+- Enable sha224 portion of powerup selftest when running test suites
+- Require nspr 4.9.1
+- Selective merge from master
+
 * Fri Apr 13 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.4-3
 - Resolves: Bug 812423 - nss_Init leaks memory, fix from RHEL 6.3
 
diff --git a/sources b/sources
index 58481cf..0191743 100644
--- a/sources
+++ b/sources
@@ -5,4 +5,4 @@ a5ae49867124ac75f029a9a33af31bad  blank-cert8.db
 2ec9e0606ba40fe65196545564b7cc2a  blank-key4.db
 bf47cecad861efa77d1488ad4a73cb5b  PayPalEE.cert
 d19159b7f91b94afaf7fa78bba006c13  nss-pem-20120402.tar.bz2
-74bbd7b520179c2e226a021fba8ff365  nss-3.13.4-stripped.tar.bz2
+658daa72d8a79589ba9e3712591939e9  nss-3.13.5-stripped.tar.bz2