[nss-softokn/f20] Update to nss-3.12.6

[Elio Maldonado]

commit f820cc6c65fddb8f1bd03f01656f55c559e88d17
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Mon Jun 30 08:01:22 2014 -0700

    Update to nss-3.12.6
    
    - Resolves: Bug 1114319 - nss-3.16.2 is available
    - Remove export NSS_ENABLE_ECC=1 as ecc is enabled by default
    - Removed unused patches

 .gitignore                      |    2 +-
 mozbug-972450.patch             |   22 --------------------
 nss-softokn.spec                |   12 +++++-----
 nss-versus-softoken-tests.patch |   42 ---------------------------------------
 sources                         |    2 +-
 5 files changed, 8 insertions(+), 72 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 58a6df3..48f788e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/nss-softokn-3.16.1.tar.gz
+/nss-softokn-3.16.2.tar.gz
diff --git a/nss-softokn.spec b/nss-softokn.spec
index 8b22a2f..f1899f8 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -1,6 +1,6 @@
-%global nspr_version 4.10.4
+%global nspr_version 4.10.6
 %global nss_name nss
-%global nss_util_version 3.16.1
+%global nss_util_version 3.16.2
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 %global saved_files_dir %{_libdir}/nss/saved
 
@@ -24,7 +24,7 @@
 
 Summary:          Network Security Services Softoken Module
 Name:             nss-softokn
-Version:          3.16.1
+Version:          3.16.2
 Release:          1%{?dist}
 License:          MPLv2.0
 URL:              http://www.mozilla.org/projects/security/pki/nss/
@@ -61,8 +61,6 @@ Patch1:           build-nss-softoken-only.patch
 # Build only the softoken and freebl related tools
 Patch8:           softoken-minimal-test-dependencies.patch
 # Select the tests to run based on the type of build
-# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=902171
-Patch9:           nss-versus-softoken-tests.patch
 # This patch uses the gcc-iquote dir option documented at
 # http://gcc.gnu.org/onlinedocs/gcc/Directory-Options.html#Directory-Options
 # to place the in-tree directories at the head of the list on list of directories
@@ -122,7 +120,6 @@ Header and library files for doing development with Network Security Services.
 
 %patch1 -p0 -b .softokenonly
 %patch8 -p0 -b .crypto
-%patch9 -p0 -b .cryptotests
 # activate if needed when doing a major update with new apis
 %patch10 -p0 -b .iquote
 
@@ -384,6 +381,9 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+*  Mon Jun 30 2014 Elio Maldonado <emaldona at redhat.com> - 3.16.2-1
+- Update to nss-3.16.2
+
 * Wed May 07 2014 Elio Maldonado <emaldona at redhat.com> - 3.16.1-1
 - Update to nss-3.16.1
 - Resolves: Bug 1094702 - nss-3.16.1 is available
diff --git a/sources b/sources
index 0c82db2..8617d8e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b82bd82a6f7d1612e44366b3d8dd2304  nss-softokn-3.16.1.tar.gz
+b66a6225e5f6932706856eb589caa833  nss-softokn-3.16.2.tar.gz