[nss-softokn/f18] Bootstrapping build prior to upcoming update of nss packages to nss-3.14

[Elio Maldonado]

commit 311b8e1f1f3d143c7690b1794444116824f477e3
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Fri Oct 26 14:17:58 2012 -0400

    Bootstrapping build prior to upcoming update of nss packages to nss-3.14
    
    - Don't install sechasht.h as nss-util-devel will install when updated to 3.14
    - Prevent update conflict between nss-util-devel-3.14 and nss-softokn-devel-3.13.6

 nss-softokn.spec |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/nss-softokn.spec b/nss-softokn.spec
index 937685e..309b6a6 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -17,7 +17,7 @@
 Summary:          Network Security Services Softoken Module
 Name:             nss-softokn
 Version:          3.13.6
-Release:          1%{?dist}
+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 26 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.6-2
+- Bootstrapping build prior to upcoming update of nss packages to nss-3.14
+- Don't install sechasht.h as nss-util-devel will install when updated to 3.14
+- Prevent update conflict between nss-util-devel-3.14 and nss-softokn-devel-3.13.6
+
 * Fri Oct 05 2012 Kai Engert <kaie at redhat.com> - 3.13.6-1
 - Update to NSS_3_13_6_RTM