[nss-softokn/f12/master: 27/27] Merge branch 'master' into f12

[Elio Maldonado]

commit 09fa6e9122b7b310feccbf8e1baa69eacbb84c06
Merge: ee2d073 3a099ab
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Thu Sep 9 16:00:07 2010 -0700

    Merge branch 'master' into f12
    
    Conflicts:
    	.gitignore
    	nss-nolocalsql.patch
    	nss-softokn-3.12.4-prelink.patch
    	nss-softokn-prelink.conf
    	nss-softokn.spec
    	sources

 .gitignore                       |    2 +-
 freebl-no-depend.patch           |   33 ++++++++++++++++++++++++
 nss-nolocalsql.patch             |   52 --------------------------------------
 nss-softokn-3.12.4-prelink.patch |   34 +++++++++---------------
 nss-softokn.spec                 |   52 ++++++++++++++++++++++---------------
 sources                          |    2 +-
 6 files changed, 79 insertions(+), 96 deletions(-)
---
diff --cc nss-softokn.spec
index 3e48cee,81eb62a..6d2b9a7
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@@ -1,7 -1,9 +1,9 @@@
- %global nspr_version 4.8.4
+ %global nspr_version 4.8.6
 -%global nspr_build_version 4.8.4
++%global nspr_build_version 4.8.6
  %global nss_name nss
--%global nss_softokn_fips_version 3.12.4
- %global nss_util_version 3.12.4
++%global nss_softokn_build_version 3.12.6
+ %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 +19,8 @@@
  
  Summary:          Network Security Services Softoken Module
  Name:             nss-softokn
- Version:          3.12.6
- Release:          2%{?dist}.1
+ Version:          3.12.7
 -Release:          2%{?dist}
++Release:          3%{?dist}
  License:          MPLv1.1 or GPLv2+ or LGPLv2+
  URL:              http://www.mozilla.org/projects/security/pki/nss/
  Group:            System Environment/Libraries
@@@ -36,17 -38,16 +38,16 @@@ BuildRequires:    psmis
  BuildRequires:    perl
  
  Source0:          %{name}-%{version}-stripped.tar.bz2
- # The nss-softokn tar ball is a subset of nss-%{version}-stripped.tar.bz2, 
 -# The nss-softokn tar ball is a subset of nss-%%{version}-stripped.tar.bz2, 
++# The nss-softokn tar ball is a subset of nss-{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
+ # Download the nss tarball via git from the nss propect and follow these
+ # steps to make the tarball for nss-util out of the one for nss:
+ # 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
++# 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
@@@ -287,9 -315,16 +290,16 @@@ don
  %{_includedir}/nss3/shsign.h
  
  %changelog
 -* Sat Aug 29 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.7-2
++* Mon Aug 30 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.7-3
++- Update to 3.12.7
++- Update BuildRequires on nspr-devel and nss-util-devel
+ - Define NSS_USE_SYSTEM_SQLITE and remove nss-nolocalsql patch
+ - Fix rpmlint warnings about macros in comments and 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
 +* Mon Jun 08 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.6-2.1
 +- Fix typo in the package description (#598295)
 +- Require nspr 4.8.4
  
  * Mon Jun 07 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.6-2
  - Bump NVR to be greater than those for nss-softokn subpackages in F11 (rhbz#601407)