[nss-util/f18] Second part of bootstrapping builds to provide a conflict-free update to 3.14 next

[Elio Maldonado]

commit 4b84e56f7eccfbe1c7d6b9ad7a7db0dfff3970e3
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Fri Oct 26 17:54:22 2012 -0400

    Second part of bootstrapping builds to provide a conflict-free update to 3.14 next
    
    - nss-util-devel now provides sechash.t as nss-softoken-devel won't from now on
    - As of nss-softokn-3.13.6-2 nss-softokn-devel stops installing hasht.t
    - providing it here to preverse the full set of installed headers
    - It's best to update to nss-util-3.13.6-2 and nss-softoken-3.13.6-2, and ther subpackages, together

 nss-split-util.sh          |    3 +++
 nss-util-adopt-hasht.patch |   11 +++++++++++
 nss-util.spec              |   16 +++++++++++++++-
 sources                    |    2 +-
 4 files changed, 30 insertions(+), 2 deletions(-)
---
diff --git a/nss-split-util.sh b/nss-split-util.sh
index 6c0a6eb..9a860f5 100644
--- a/nss-split-util.sh
+++ b/nss-split-util.sh
@@ -55,6 +55,9 @@ mkdir ${UTIL_WORK}/${util_dir}/mozilla/security/nss/lib
 cp ${nss_source_dir}/mozilla/security/nss/lib/Makefile ${UTIL_WORK}/${util_dir}/mozilla/security/nss/lib
 cp ${nss_source_dir}/mozilla/security/nss/lib/manifest.mn ${UTIL_WORK}/${util_dir}/mozilla/security/nss/lib
 cp -a ${nss_source_dir}/mozilla/security/nss/lib/util ${UTIL_WORK}/${util_dir}/mozilla/security/nss/lib/util
+# copy one header that will belong to nss-util-devel
+cp -a ${nss_source_dir}/mozilla/security/nss/lib/freebl/hasht.h ${UTIL_WORK}/${util_dir}/mozilla/security/nss/lib/util
+
 pushd ${UTIL_WORK}
 # the compressed tar ball for nss-util
 tar -cjf ../${name}-util-${version}.tar.bz2 ${util_dir}
diff --git a/nss-util-adopt-hasht.patch b/nss-util-adopt-hasht.patch
new file mode 100644
index 0000000..32923ad
--- /dev/null
+++ b/nss-util-adopt-hasht.patch
@@ -0,0 +1,11 @@
+diff -up ./mozilla/security/nss/lib/util/manifest.mn.bootstrap ./mozilla/security/nss/lib/util/manifest.mn
+--- ./mozilla/security/nss/lib/util/manifest.mn.bootstrap	2012-10-26 15:40:59.739240522 -0400
++++ ./mozilla/security/nss/lib/util/manifest.mn	2012-10-26 15:41:53.366427356 -0400
+@@ -39,6 +39,7 @@ CORE_DEPTH = ../../..
+ EXPORTS = \
+ 	base64.h \
+ 	ciferfam.h \
++	hasht.h \
+ 	nssb64.h \
+ 	nssb64t.h \
+ 	nsslocks.h \
diff --git a/nss-util.spec b/nss-util.spec
index 78df0f2..b41d90e 100644
--- a/nss-util.spec
+++ b/nss-util.spec
@@ -3,7 +3,7 @@
 Summary:          Network Security Services Utilities Library
 Name:             nss-util
 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
@@ -40,6 +40,8 @@ Source3:          nss-util.pc.in
 Source4:          nss-util-config.in
 
 Patch1:           add-relro-linker-option.patch
+# Remove when we update to 3.14
+Patch2:           nss-util-adopt-hasht.patch
 
 %description
 Utilities for Network Security Services and the Softoken module
@@ -62,6 +64,7 @@ Header and library files for doing development with Network Security Services.
 %setup -q
 
 %patch1 -p0 -b .relro
+%patch2 -p0 -b .bootstrap
 
 
 %build
@@ -149,6 +152,9 @@ do
   %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
 done
 
+# explicitely copy the new header we own
+%{__install} -p -m 644 mozilla/dist/public/nss/hasht.h $RPM_BUILD_ROOT/%{_includedir}/nss3
+
 # Copy the include files we want
 # The util headers, the rest come from softokn and nss
 for file in mozilla/dist/public/nss/*.h
@@ -183,6 +189,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
@@ -213,6 +220,13 @@ done
 %{_includedir}/nss3/utilrename.h
 
 %changelog
+* Fri Oct 26 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.6-2
+- Second part of bootstrapping builds to provide a conflict-free update to 3.14 next
+- nss-util-devel now provides sechash.t as nss-softoken-devel won't from now on
+- As of nss-softokn-3.13.6-2 nss-softokn-devel stops installing hasht.t
+- providing it here to preverse the full set of installed headers
+- It's best to update to nss-util-3.13.6-2 and nss-softoken-3.13.6-2, and ther subpackages, together
+
 * Fri Oct 05 2012 Kai Engert <kaie at redhat.com> - 3.13.6-1
 - Update to NSS_3_13_6_RTM
 
diff --git a/sources b/sources
index e853729..4a97e21 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f2bccc9885178618db67e72077eca69c  nss-util-3.13.6.tar.bz2
+cfbb83e8e3e99599fe96848b08ff5f99  nss-util-3.13.6.tar.bz2