[nss-softokn] Update to 3.12.7

[Elio Maldonado]

commit 370749a8836b16582095d3258e999a137b02bfe9
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Wed Aug 18 17:02:50 2010 -0700

    Update to 3.12.7

 nss-softokn.spec |   33 ++++++++++++++++++++-------------
 1 files changed, 20 insertions(+), 13 deletions(-)
---
diff --git a/nss-softokn.spec b/nss-softokn.spec
index 37bf0de..8fb5406 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -1,7 +1,9 @@
-%global nspr_version 4.8.4
+%global nspr_version 4.8.6
+%global nspr_build_version 4.8.4
 %global nss_name nss
 %global nss_softokn_fips_version 3.12.4
-%global nss_util_version 3.12.4
+%global nss_util_version 3.12.7
+%global nss_util_build_version 3.12.6
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 %global saved_files_dir %{_libdir}/nss/saved
 
@@ -17,8 +19,8 @@
 
 Summary:          Network Security Services Softoken Module
 Name:             nss-softokn
-Version:          3.12.6
-Release:          3%{?dist}
+Version:          3.12.7
+Release:          1%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -26,8 +28,8 @@ Requires:         nspr >= %{nspr_version}
 Requires:         nss-util >= %{nss_util_version}
 Requires:         nss-softokn-freebl%{_isa} >= %{version}
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:    nspr-devel >= %{nspr_version}
-BuildRequires:    nss-util-devel >= %{nss_util_version}
+BuildRequires:    nspr-devel >= %{nspr_build_version}
+BuildRequires:    nss-util-devel >= %{nss_util_build_version}
 BuildRequires:    sqlite-devel
 BuildRequires:    zlib-devel
 BuildRequires:    pkgconfig
@@ -40,13 +42,12 @@ Source0:          %{name}-%{version}-stripped.tar.bz2
 # Therefore we use the nss-split-softokn.sh script to keep only what we need.
 # Download the nss tarball via CVS from the nss propect and follow these
 # steps to make the r tarball for nss-util out of the for nss:
-# cvs co nss
-# cvs nss-softokn (as soon as it is in cvs - for now extract the srpm)
-# cd nss-softokn/devel
+# fedpkg clone nss
+# fedpkg clone nss-softokn
+# cd nss-softokn
 # cp ../../nss/devel/${version}-stripped.tar.bz2  .
-# (use 3.12.3.99.3 for version above until 3.12.4 comes out)
 # sh ./nss-split-softokn.sh ${version}
-# A %{name}-%{version}--stripped.tar.bz2 should appear
+# A file named %{name}-%{version}--stripped.tar.bz2 should appear
 Source1:          nss-split-softokn.sh
 Source2:          nss-softokn.pc.in
 Source3:          nss-softokn-config.in
@@ -54,6 +55,7 @@ Source3:          nss-softokn-config.in
 Patch1:           nss-nolocalsql.patch
 Patch2:           nss-softokn-3.12.4-prelink.patch
 Patch3:           nss-softokn-3.12.4-fips-fix.patch
+Patch4:           freebl-no-depend.patch
 
 %description
 Network Security Services Softoken Cryptographic Module
@@ -85,8 +87,8 @@ Requires:         nss-softokn%{?_isa} = %{version}-%{release}
 Requires:         nspr-devel >= %{nspr_version}
 Requires:         nss-util-devel >= %{version}
 Requires:         pkgconfig
-BuildRequires:    nspr-devel >= %{nspr_version}
-BuildRequires:    nss-util-devel >= %{version}
+BuildRequires:    nspr-devel >= %{nspr_build_version}
+BuildRequires:    nss-util-devel >= %{nss_util_build_version}
 # require nss at least the version when we split via subpackages
 BuildRequires:    nss-devel >= 3.12.2.99.3-11
 
@@ -100,6 +102,7 @@ Header and Library files for doing development with Network Security Services.
 %patch1 -p0
 %patch2 -p0 -b .prelink
 %patch3 -p0
+%patch4 -p0 -b .freeblnodepend
 
 %build
 
@@ -312,6 +315,10 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Mon Aug 16 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.7-1
+- Update to 3.12.7
+- Fix build files to ensure nsslowhash.h is included in public headers
+
 * Tue Jun 08 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.6-3
 - Retagging