[nss-util] Update to NSS_3_14_BETA1

[Elio Maldonado]

commit 8fc7b208009878bbb53d0476ebee190f5acd3210
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Wed Oct 3 12:53:00 2012 -0700

    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
    - Add an Obsoletes to prevent install conflicts caused by having moved hasht.h to this package

 .gitignore                        |    2 +-
 nss-util.spec                     |   24 +++++++++++++++++++-----
 sources                           |    2 +-
 utilmod_no_softoken_headers.patch |   10 ++++++++++
 4 files changed, 31 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3671210..f1b1c5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/nss-util-3.13.5.tar.bz2
+/nss-util-3.14.tar.bz2
diff --git a/nss-util.spec b/nss-util.spec
index 1c43b59..4db88fe 100644
--- a/nss-util.spec
+++ b/nss-util.spec
@@ -1,9 +1,9 @@
-%global nspr_version 4.9.1
+%global nspr_version 4.9.3
 
 Summary:          Network Security Services Utilities Library
 Name:             nss-util
-Version:          3.13.5
-Release:          4%{?dist}
+Version:          3.14
+Release:          0.1%{?dist}.beta1.1
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -39,7 +39,9 @@ Source2:          nss-split-util.sh
 Source3:          nss-util.pc.in
 Source4:          nss-util-config.in
 
-Patch1:           add-relro-linker-option.patch
+# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=753116
+# Remove when this patch upstream is applied upstream
+Patch1:           utilmod_no_softoken_headers.patch
 
 %description
 Utilities for Network Security Services and the Softoken module
@@ -50,6 +52,8 @@ Utilities for Network Security Services and the Softoken module
 %package devel
 Summary:          Development libraries for Network Security Services Utilities
 Group:            Development/Libraries
+# prevents install conflicts caused by hasht.h having moved to this package
+Obsoletes:        nss-softoken-devel < 3.14
 Requires:         nss-util = %{version}-%{release}
 Requires:         nspr-devel >= %{nspr_version}
 Requires:         pkgconfig
@@ -61,7 +65,7 @@ Header and library files for doing development with Network Security Services.
 %prep
 %setup -q
 
-%patch1 -p0 -b .relro
+%patch1 -p0 -b .nosoftokenheaders
 
 
 %build
@@ -183,6 +187,7 @@ done
 # mozilla/security/nss/lib/util/manifest.mk
 %{_includedir}/nss3/base64.h
 %{_includedir}/nss3/ciferfam.h
+%{_includedir}/nss3/hasht.h
 %{_includedir}/nss3/nssb64.h
 %{_includedir}/nss3/nssb64t.h
 %{_includedir}/nss3/nsslocks.h
@@ -210,9 +215,18 @@ done
 %{_includedir}/nss3/secoid.h
 %{_includedir}/nss3/secoidt.h
 %{_includedir}/nss3/secport.h
+%{_includedir}/nss3/utilmodt.h
+%{_includedir}/nss3/utilpars.h
+%{_includedir}/nss3/utilparst.h
 %{_includedir}/nss3/utilrename.h
 
 %changelog
+* 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
+- Add an Obsoletes to prevent install conflicts caused by having moved hasht.h to this package
+
 * 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 60cc853..b9aa721 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b4241737996ac0f4c95d31f294f878cf  nss-util-3.13.5.tar.bz2
+3f84da5b0e414824fd364b08d662168e  nss-util-3.14.tar.bz2
diff --git a/utilmod_no_softoken_headers.patch b/utilmod_no_softoken_headers.patch
new file mode 100644
index 0000000..4afb24b
--- /dev/null
+++ b/utilmod_no_softoken_headers.patch
@@ -0,0 +1,10 @@
+Index: ./mozilla/security/nss/lib/util/utilmod.c
+===================================================================
+RCS file: /cvsroot/mozilla/security/nss/lib/util/utilmod.c,v
+retrieving revision 1.4
+diff -r1.4 utilmod.c
+21c21,22
+< #include "lgglue.h"
+---
+> #include "pkcs11t.h"
+> #include "secitem.h"