[nss-util] Update to NSS_3_14_RC1

[Elio Maldonado]

commit 17dcb004d21bbbffcdb52e2892cb46a4e93f1536
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Fri Oct 19 09:26:39 2012 -0700

    Update to NSS_3_14_RC1
    
    - hasht.h from now on is provided by nss-util-devel

 nss-util.spec |   22 ++++++++--------------
 sources       |    2 +-
 2 files changed, 9 insertions(+), 15 deletions(-)
---
diff --git a/nss-util.spec b/nss-util.spec
index 31b32bf..c798f2d 100644
--- a/nss-util.spec
+++ b/nss-util.spec
@@ -52,11 +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
+# Uncomment this if nededed to prevent install/update conflict with
+# unstalled nss-softoken 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
+#Conflicts:        nss-softokn-devel < 3.14
+#Obsoletes:        nss-softokn-devel < 3.14
+#Provides:         /usr/include/nss3/hasht.h
 
 %description devel
 Header and library files for doing development with Network Security Services.
@@ -141,7 +142,6 @@ chmod 755 ./mozilla/dist/pkgconfig/nss-util-config
 # There is no make install target so we'll do it ourselves.
 
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/nss3
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/nss3/util
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/nss3
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
@@ -220,15 +220,9 @@ done
 %{_includedir}/nss3/utilrename.h
 
 %changelog
-* 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
-- Add patch so utilmod doesn't include any headers from softoken
-- Remove the relro patch that rebase renders obsolete
+* Fri Oct 19 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-0.1.rc1.1
+- Update to NSS_3_14_RC1
+- The hasht.h from now on is provided by nss-util-devel
 
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.13.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 1b4e6d4..0c91290 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-da2a4543c19f4c4fe7be58a363b87c3e  nss-util-3.14.tar.bz2
+eae17f9228ce2a22dd50750044c691ee  nss-util-3.14.tar.bz2