[nss-softokn] Reverse the last changes since pk11gcmtest properly belongs to nss

[Elio Maldonado]

commit 051ee8013df8a1c8f63b0614757951f1a3d63250
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Tue Apr 23 16:40:09 2013 -0700

    Reverse the last changes since pk11gcmtest properly belongs to nss

 nss-softokn.spec     |   11 ++++++-----
 nss-split-softokn.sh |    1 -
 sources              |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/nss-softokn.spec b/nss-softokn.spec
index 7a68067..10d916c 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -25,7 +25,7 @@
 Summary:          Network Security Services Softoken Module
 Name:             nss-softokn
 Version:          3.15
-Release:          0.1%{?dist}.beta.2
+Release:          0.1%{?dist}.beta.3
 License:          MPLv2.0
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -298,7 +298,7 @@ do
 done
 
 # Copy the binaries we ship as unsupported
-for file in bltest fipstest lowhashtest pk11gcmtest shlibsign
+for file in bltest fipstest shlibsign
 do
   %{__install} -p -m 755 dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
 done
@@ -346,8 +346,6 @@ done
 %dir %{unsupported_tools_directory}
 %{unsupported_tools_directory}/bltest
 %{unsupported_tools_directory}/fipstest
-%{unsupported_tools_directory}/lowhashtest
-%{unsupported_tools_directory}/pk11gcmtest
 %{unsupported_tools_directory}/shlibsign
 
 %files freebl
@@ -383,13 +381,16 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Tue Apr 23 2013 Elio Maldonado <emaldona at redhat.com> - 3.15-0.1.beta.3
+- Reverse the last changes since pk11gcmtest properly belongs to nss
+
 * Tue Apr 23 2013 Elio Maldonado <emaldona at redhat.com> - 3.15-0.1.beta.2
 - Add lowhashtest and pk11gcmtest as unsupported tools
 - Modify nss-softoken-split script to include them in the split
 
 * Fri Apr 05 2013 Elio Maldonado <emaldona at redhat.com> - 3.15-0.1.beta.1
 - Update to NSS_3_15_BETA1
-- Update spec file, patches, and helper scrips on account of a shallower source tree
+- Update spec file, patches, and helper scrips on account of a shallwer source tree
 
 * Fri Feb 15 2013 Elio Maldonado <emaldona at redhat.com> - 3.14.3-1
 - Update to NSS_3_14_3_RTM
diff --git a/nss-split-softokn.sh b/nss-split-softokn.sh
index f10b7e7..b05e797 100755
--- a/nss-split-softokn.sh
+++ b/nss-split-softokn.sh
@@ -86,7 +86,6 @@ cp -a ${nss_source_dir}/nss/cmd/bltest ${WORK}/${softokn_dir}/nss/cmd/bltest
 cp -a ${nss_source_dir}/nss/cmd/fipstest ${WORK}/${softokn_dir}/nss/cmd/fipstest
 cp -a ${nss_source_dir}/nss/cmd/lib ${WORK}/${softokn_dir}/nss/cmd/lib
 cp -a ${nss_source_dir}/nss/cmd/lowhashtest ${WORK}/${softokn_dir}/nss/cmd/lowhashtest
-cp -a ${nss_source_dir}/nss/cmd/pk11gcmtest ${WORK}/${softokn_dir}/nss/cmd/pk11gcmtest
 cp -a ${nss_source_dir}/nss/cmd/shlibsign ${WORK}/${softokn_dir}/nss/cmd/shlibsign
 
 # plus common and crypto from nss/tests
diff --git a/sources b/sources
index 8f1a56a..4b2fad0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6a6e6884428d3fad434d0e4533696dee  nss-softokn-3.15-stripped.tar.bz2
+4f969b16a605caab53d5b607d9b711df  nss-softokn-3.15-stripped.tar.bz2