[nss-util/f19] Split off nss-util from full nss sources as released upstream

[Elio Maldonado]

commit 22fe615c8eff8305d3d7868dc3b43e7d168f1bde
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sun Oct 27 10:09:27 2013 -0700

    Split off nss-util from full nss sources as released upstream

 .gitignore              |    2 +-
 mozilla-crypto-strip.sh |  128 -----------------------------------------------
 nss-split-util.sh       |    6 +-
 nss-util.spec           |   37 ++++++--------
 sources                 |    2 +-
 5 files changed, 21 insertions(+), 154 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4c43ee9..4d866d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/nss-util-3.15.2.tar.bz2
+/nss-util-3.15.2.tar.gz
diff --git a/nss-split-util.sh b/nss-split-util.sh
index 08d875e..b56debe 100644
--- a/nss-split-util.sh
+++ b/nss-split-util.sh
@@ -16,9 +16,9 @@ fi
 export name=nss
 export version=$1
 
-echo "Extracting ${name}-${version}-stripped.tar.bz2"
+echo "Extracting ${name}-${version}.tar.gz"
 
-tar -xjf ${name}-${version}-stripped.tar.bz2
+tar -xzf ${name}-${version}.tar.gz
 
 # the directory will be named ${name}-${version}
 
@@ -62,7 +62,7 @@ cp ${nss_source_dir}/nss/lib/manifest.mn ${UTIL_WORK}/${util_dir}/nss/lib
 cp -a ${nss_source_dir}/nss/lib/util ${UTIL_WORK}/${util_dir}/nss/lib/util
 pushd ${UTIL_WORK}
 # the compressed tar ball for nss-util
-tar -cjf ../${name}-util-${version}.tar.bz2 ${util_dir}
+tar -czf ../${name}-util-${version}.tar.gz ${util_dir}
 popd
 
 # cleanup after ourselves
diff --git a/nss-util.spec b/nss-util.spec
index 01a3897..d8decc2 100644
--- a/nss-util.spec
+++ b/nss-util.spec
@@ -3,7 +3,7 @@
 Summary:          Network Security Services Utilities Library
 Name:             nss-util
 Version:          3.15.2
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          MPLv2.0
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -16,28 +16,20 @@ BuildRequires:    gawk
 BuildRequires:    psmisc
 BuildRequires:    perl
 
-Source0:          %{name}-%{version}.tar.bz2
-# The nss-util tar ball is a subset of nss-{version}-stripped.tar.bz2.
-# We use the nss-split-util.sh script for keeping only what we need.
-# We first produce the full source archive from from the upstream,
-# nss-{version}-stripped.tar.gz, by running mozilla-crypto-strip.sh
-# to remove any non-free sources, none in this case but we want a bz2 archive, 
-# and then split off  nss-util from it via nss-split-util.sh {name}-{version}
+Source0:          %{name}-%{version}.tar.gz
+# The nss-util tar ball is a subset of nss-{version}.tar.gz.
+# We use the nss-split-util.sh script for keeping only what we need
+# nss-util is produced via via nss-split-util.sh {version}
 # Detailed Steps:
 # fedpkg clone nss-util
 # cd nss-util
-# Download the nss-{version}-stripped.tar.gz tarball from upstream
-# Strip-off unwanted sources with
-# ./mozilla-crypto-srip.sh nss-{version}-stripped.tar.gz
-# which produces nss-{version}-stripped.tar.bz2
 # Make the source tarball for nss-util out of the nss one:
 # sh ./nss-split-util.sh ${version}
-# A file named ${name}-${version}.tar.bz2 should appear
+# A file named ${name}-${version}.tar.gz should appear
 # ready to upload to the lookaside cache.
-Source1:          mozilla-crypto-strip.sh
-Source2:          nss-split-util.sh
-Source3:          nss-util.pc.in
-Source4:          nss-util-config.in
+Source1:          nss-split-util.sh
+Source2:          nss-util.pc.in
+Source3:          nss-util-config.in
 
 Patch1: build-nss-util-only.patch
 Patch2: hasht-dont-include-prtypes.patch
@@ -108,7 +100,7 @@ export USE_64
 
 # Set up our package file
 %{__mkdir_p} ./dist/pkgconfig
-%{__cat} %{SOURCE3} | sed -e "s,%%libdir%%,%{_libdir},g" \
+%{__cat} %{SOURCE2} | sed -e "s,%%libdir%%,%{_libdir},g" \
                           -e "s,%%prefix%%,%{_prefix},g" \
                           -e "s,%%exec_prefix%%,%{_prefix},g" \
                           -e "s,%%includedir%%,%{_includedir}/nss3,g" \
@@ -120,11 +112,11 @@ NSSUTIL_VMAJOR=`cat nss/lib/util/nssutil.h | grep "#define.*NSSUTIL_VMAJOR" | aw
 NSSUTIL_VMINOR=`cat nss/lib/util/nssutil.h | grep "#define.*NSSUTIL_VMINOR" | awk '{print $3}'`
 NSSUTIL_VPATCH=`cat nss/lib/util/nssutil.h | grep "#define.*NSSUTIL_VPATCH" | awk '{print $3}'`
 
-export NSSUTIL_VMAJOR 
-export NSSUTIL_VMINOR 
+export NSSUTIL_VMAJOR
+export NSSUTIL_VMINOR
 export NSSUTIL_VPATCH
 
-%{__cat} %{SOURCE4} | sed -e "s, at libdir@,%{_libdir},g" \
+%{__cat} %{SOURCE3} | sed -e "s, at libdir@,%{_libdir},g" \
                           -e "s, at prefix@,%{_prefix},g" \
                           -e "s, at exec_prefix@,%{_prefix},g" \
                           -e "s, at includedir@,%{_includedir}/nss3,g" \
@@ -228,6 +220,9 @@ done
 %{_includedir}/nss3/templates/templates.c
 
 %changelog
+* Sun Oct 27 2013 Elio Maldonado <emaldona at redhat.com> - 3.15.2-2
+- Split off nss-util from full nss sources as released upstream
+
 * Thu Sep 26 2013 Elio Maldonado <emaldona at redhat.com> - 3.15.2-1
 - Update to NSS_3_15_2_RTM
 
diff --git a/sources b/sources
index 2fcc002..0cc2fc6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-10c64069b11e1b4ee874f92751a1c028  nss-util-3.15.2.tar.bz2
+38aec93d5de6447dab998dba43e855e0  nss-util-3.15.2.tar.gz