[nss-softokn/f13/master: 22/22] Merge branch 'master' into f13

[Elio Maldonado]

commit 88180e8146922c480b0f136996d7a3cd95a74281
Merge: 7a21ae7 44989b0
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Thu Sep 2 17:15:24 2010 -0700

    Merge branch 'master' into f13
    
    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
    Fix build files to ensure nsslowhash.h is included in public headers

 .gitignore                       |    2 +-
 freebl-no-depend.patch           |   33 ++++++++++++++++++++++++
 nss-nolocalsql.patch             |   52 --------------------------------------
 nss-softokn-3.12.4-prelink.patch |   34 +++++++++---------------
 nss-softokn-prelink.conf         |    4 ---
 nss-softokn.spec                 |   48 +++++++++++++++++++++--------------
 sources                          |    2 +-
 7 files changed, 77 insertions(+), 98 deletions(-)
---
diff --cc nss-softokn.spec
index 300f7b1,884c8d5..b81b16e
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@@ -1,7 -1,6 +1,9 @@@
- %global nspr_version 4.8.4
+ %global nspr_version 4.8.6
++%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
  
@@@ -26,8 -25,8 +28,8 @@@ Requires:         nspr >= %{nspr_versio
  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
@@@ -36,17 -35,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
@@@ -85,8 -83,8 +86,8 @@@ Requires:         nss-softokn%{?_isa} 
  Requires:         nspr-devel >= %{nspr_version}
  Requires:         nss-util-devel >= %{version}
  Requires:         pkgconfig
--BuildRequires:    nspr-devel >= %{nspr_version}
- BuildRequires:    nss-util-devel >= %{version}
 -BuildRequires:    nss-util-devel >= %{nss_util_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
  
@@@ -312,6 -312,17 +315,13 @@@ don
  %{_includedir}/nss3/shsign.h
  
  %changelog
+ * 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
 -
 -* Sat Aug 29 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.7-2
+ - 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