[nss-softokn/f19] Update to nss-3.17.0

[Elio Maldonado]

commit 531a9835c34e9cb4eb7588b5a84db356b16bdca3
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Fri Aug 22 08:26:34 2014 -0700

    Update to nss-3.17.0
    
    - selective merge from f21
    
    Conflicts:
    	nss-softokn.spec

 .gitignore       |    2 +-
 nss-softokn.spec |   11 ++++++++---
 sources          |    2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 48f788e..3bb6de0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/nss-softokn-3.16.2.tar.gz
+/nss-softokn-3.17.0.tar.gz
diff --git a/nss-softokn.spec b/nss-softokn.spec
index 02af664..59f0529 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -1,6 +1,6 @@
-%global nspr_version 4.10.6
+%global nspr_version 4.10.7
 %global nss_name nss
-%global nss_util_version 3.16.2
+%global nss_util_version 3.17.0
 %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.2
+Version:          3.17.0
 Release:          1%{?dist}
 License:          MPLv2.0
 URL:              http://www.mozilla.org/projects/security/pki/nss/
@@ -350,6 +350,8 @@ done
 
 %files freebl
 %defattr(-,root,root)
+%{!?_licensedir:%global license %%doc}
+%license nss/COPYING
 %{_libdir}/libfreebl3.so
 %{_libdir}/libfreebl3.chk
 
@@ -381,6 +383,9 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Mon Aug 25 2014 Elio Maldonado <emaldona at redhat.com> - 3.17.1-1
+- Update to nss-3.17.0
+
 *  Mon Jun 30 2014 Elio Maldonado <emaldona at redhat.com> - 3.16.2-1
 - Update to nss-3.16.2
 
diff --git a/sources b/sources
index 8617d8e..8abd68b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b66a6225e5f6932706856eb589caa833  nss-softokn-3.16.2.tar.gz
+bcb380981f87bbb1f01fbb881003037e  nss-softokn-3.17.0.tar.gz