[nss-softokn] Bootstrapping build prior to update to nss-3.14

[Elio Maldonado]

commit 56215c97e0da4a7c295abf17a2d5736bcdbd3865
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Wed Oct 17 20:24:43 2012 -0700

    Bootstrapping build prior to update to nss-3.14
    
    - Remove hasht.h from the list of headers to install
    - Prevent conflicts when we update to 3.14 next where nss-util-devel will own hasht.h

 .gitignore       |    2 +-
 nss-softokn.spec |   21 ++++++++++++++++-----
 sources          |    2 +-
 3 files changed, 18 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7049fd5..bf793ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/nss-softokn-3.13.5-stripped.tar.bz2
+/nss-softokn-3.13.6-stripped.tar.bz2
diff --git a/nss-softokn.spec b/nss-softokn.spec
index 8254837..5b3109a 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -1,6 +1,6 @@
-%global nspr_version 4.9.1
+%global nspr_version 4.9.2
 %global nss_name nss
-%global nss_util_version 3.13.5
+%global nss_util_version 3.13.6
 %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.13.5
-Release:          3%{?dist}
+Version:          3.13.6
+Release:          2%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -317,6 +317,13 @@ do
   %{__install} -p -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
 done
 
+# Don't install hasht.h to prevent a conflict when we update to 3.14
+# where nss-util-devel will become the owner of hasht.h
+for file in mozilla/dist/public/nss/hasht.h
+do
+  %{__rm} -f $file
+done
+
 # Copy the include files we want
 for file in mozilla/dist/public/nss/*.h
 do
@@ -389,13 +396,17 @@ done
 # which installed them before us.
 #
 %{_includedir}/nss3/ecl-exp.h
-%{_includedir}/nss3/hasht.h
 %{_includedir}/nss3/sechash.h
 %{_includedir}/nss3/nsslowhash.h
 %{_includedir}/nss3/secmodt.h
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Fri Oct 05 2012 Kai Engert <kaie at redhat.com> - 3.13.6-2
+- Bootstrapping build prior to update to nss-3.14
+- Remove hasht.h from the list of headers to install
+- Prevent conflicts when we update to 3.14 next where nss-util-devel will own hasht.h
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.13.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index be18886..15972dd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6538775aaa70915344965ba49cbe4450  nss-softokn-3.13.5-stripped.tar.bz2
+06f4117501e293b69d8e1683e9e6bf25  nss-softokn-3.13.6-stripped.tar.bz2