From 8f6f357e8884da34befc864b2d9d309a09854c6e Mon Sep 17 00:00:00 2001
From: Elio Maldonado <emaldona@redhat.com>
Date: Fri, 27 Sep 2013 09:50:45 -0700
Subject: [PATCH] Update to NSS_3_15_2_RTM

---
 .gitignore |  2 +-
 nss.spec   | 18 ++++++++----------
 sources    |  2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 71d69f8..370b654 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,5 +7,5 @@ PayPalEE.cert
 TestCA.ca.cert
 TestUser50.cert
 TestUser51.cert
-/nss-3.15.1-stripped.tar.bz2
 /nss-pem-20130828.tar.bz2
+/nss-3.15.2-stripped.tar.bz2
diff --git a/nss.spec b/nss.spec
index 8a3ed0c..ec5140f 100644
--- a/nss.spec
+++ b/nss.spec
@@ -1,7 +1,7 @@
-%global nspr_version 4.10
-%global nss_util_version 3.15.1
+%global nspr_version 4.10.1
+%global nss_util_version 3.15.2
 %global nss_softokn_fips_version 3.12.9
-%global nss_softokn_version 3.15.1
+%global nss_softokn_version 3.15.2
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 %global allTools "certutil cmsutil crlutil derdump modutil pk12util pp signtool signver ssltap vfychain vfyserv"
 
@@ -19,8 +19,8 @@
 
 Summary:          Network Security Services
 Name:             nss
-Version:          3.15.1
-Release:          7%{?dist}
+Version:          3.15.2
+Release:          1%{?dist}
 License:          MPLv2.0
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -110,8 +110,6 @@ Patch48:          nss-versus-softoken-tests.patch
 # TODO remove when we switch to building nss without softoken
 Patch49:          nss-skip-bltest-and-fipstest.patch
 Patch50:          iquote.patch
-# Upstream: https://bugzilla.mozilla.org/show_bug_cgi?id=836477
-Patch51:          manpages-fixes.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -206,9 +204,6 @@ low level services.
 %patch48 -p0 -b .crypto
 %patch49 -p0 -b .skipthem
 %patch50 -p0 -b .iquote
-pushd nss
-%patch51 -p1 -b .948495
-popd
 
 #########################################################
 # Higher-level libraries and test tools need access to
@@ -760,6 +755,9 @@ fi
 
 
 %changelog
+* Thu Sep 26 2013 Elio Maldonado <emaldona@redhat.com> - 3.15.2-1
+- Update to NSS_3_15_2_RTM
+
 * Wed Aug 28 2013 Elio Maldonado <emaldona@redhat.com> - 3.15.1-7
 - Update pem sources to pick up a patch applied upstream which a faulty merge had missed
 - The pem module should not require unique file basenames
diff --git a/sources b/sources
index d8e52c3..c14d054 100644
--- a/sources
+++ b/sources
@@ -7,5 +7,5 @@ a5ae49867124ac75f029a9a33af31bad  blank-cert8.db
 f998b70c1be25e8bb9f5fdb5d50eb6f2  TestCA.ca.cert
 1b7b6808cd77d5df29bf5bb9e5fac967  TestUser50.cert
 ab0b56dd505a995425c03e5266f7c8d6  TestUser51.cert
-ee649aa333d24c8e364140cc24860ff6  nss-3.15.1-stripped.tar.bz2
 e82dd2b9520f9d0f5d101e7710d59656  nss-pem-20130828.tar.bz2
+b402f7062b1c0c0ee9d0f223d03b4d6a  nss-3.15.2-stripped.tar.bz2