[nss-util] Update to NSS_3_14_RC0

[Elio Maldonado]

commit 918082c619fb5d814dfc942781f8b719cff191fe
Author: Elio Maldonado <emaldona at localhost.localdomain>
Date:   Wed Oct 17 19:26:07 2012 -0400

    Update to NSS_3_14_RC0
    
    - Add Conflicts: and Obsolotes: with older nss-softokn-devel on account of hasht.h
    - This header from now on is provided by nss-util-devel

 .gitignore                        |    2 +-
 add-relro-linker-option.patch     |   16 ----------------
 nss-util.spec                     |   34 +++++++++++++---------------------
 sources                           |    2 +-
 utilmod_no_softoken_headers.patch |   10 ----------
 5 files changed, 15 insertions(+), 49 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6e2020b..f1b1c5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/nss-util-3.14.0.0.tar.bz2
+/nss-util-3.14.tar.bz2
diff --git a/nss-util.spec b/nss-util.spec
index 6d42074..31b32bf 100644
--- a/nss-util.spec
+++ b/nss-util.spec
@@ -2,8 +2,8 @@
 
 Summary:          Network Security Services Utilities Library
 Name:             nss-util
-Version:          3.14.0.0
-Release:          1%{?dist}
+Version:          3.14
+Release:          0.1%{?dist}.rc0.1
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -52,6 +52,12 @@ Requires:         nss-util = %{version}-%{release}
 Requires:         nspr-devel >= %{nspr_version}
 Requires:         pkgconfig
 
+# Prevent a yum install/update conflict as nss-util-devel now provides hasht.h
+# which prior to the update to 3.14 was provided by nss-softokn-devel.
+Conflicts:        nss-softokn-devel = nss-3.13.6-1
+Obsoletes:        nss-softokn-devel = nss-3.13.6-1 
+Provides:         /usr/include/nss3/hasht.h
+
 %description devel
 Header and library files for doing development with Network Security Services.
 
@@ -146,16 +152,6 @@ do
   %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
 done
 
-# BEGIN TEMPORARY WORKAROUND FOR CONFLICTS
-# Prevent nss-util-devel from conflicting with nss-softoken-devel due to hasht.h.
-# Preserve hasht.h installed by current nss-softokn-devel by moving it to a nested directory.
-# Using loop in case we need to do it for others files.
-for file in mozilla/dist/public/nss/hasht.h
-do
-  %{__mv} mozilla/dist/public/nss/hasht.h $RPM_BUILD_ROOT/%{_includedir}/nss3/util
-done
-# BEGIN TEMPORARY WORKAROUND FOR CONFLICTS
-
 # Copy the include files we want
 # The util headers, the rest come from softokn and nss
 for file in mozilla/dist/public/nss/*.h
@@ -190,11 +186,7 @@ done
 # mozilla/security/nss/lib/util/manifest.mk
 %{_includedir}/nss3/base64.h
 %{_includedir}/nss3/ciferfam.h
-# Temporary workaround to avoid install conflicts with nss-softokn-devel until we can
-# rebuild nss-softokn. Preserve the hasht.h from current nss-softokn-devel by installing
-# it in a nested directory. Restore the original path once nss-softoken is rebuilt.
-#%{_includedir}/nss3/hasht.h
-%{_includedir}/nss3/util/hasht.h
+%{_includedir}/nss3/hasht.h
 %{_includedir}/nss3/nssb64.h
 %{_includedir}/nss3/nssb64t.h
 %{_includedir}/nss3/nsslocks.h
@@ -228,10 +220,10 @@ done
 %{_includedir}/nss3/utilrename.h
 
 %changelog
-* Wed Oct 17 2012 Elio Maldonado <emaldona at redhat.com> - 3.14.0.0-1
-- Update to nss-3.14.0.0-1
-- Temporarily keep the hasht.h from current nss-softokn-devel
-- Will restore its original path to /usr/include/nss3 once nss-softokn has been rebuilt
+* Wed Oct 17 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-0.1.rc0.1
+- Update to NSS_3_14_RC0
+- Add Conflicts: and Obsolotes: with older nss-softokn-devel on account of hasht.h
+- This header from now on is provided by nss-util-devel
 
 * Wed Oct 03 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.5-5
 - Update to NSS_3_14_BETA1
diff --git a/sources b/sources
index 2164a03..1b4e6d4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3d98b2f6f579710b1691925a8fb24d3e  nss-util-3.14.0.0.tar.bz2
+da2a4543c19f4c4fe7be58a363b87c3e  nss-util-3.14.tar.bz2