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

[Elio Maldonado]

commit d810a7faa0a1099dd3e61703be9f9f59f9c487ed
Merge: 88180e8 21e9146
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sun Sep 12 12:23:17 2010 -0700

    Merge branch 'f14' into f13
    
    Selective merge to preserve this branch's changelog history

 nss-softokn.spec |   28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 deletions(-)
---
diff --cc nss-softokn.spec
index b81b16e,a2a6155..7405954
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@@ -315,11 -312,27 +312,20 @@@ don
  %{_includedir}/nss3/shsign.h
  
  %changelog
+ * Sun Sep 12 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.7-6
+ - Fix BuildRequires: nss-util-devel to be >= {nss_util_version}
+ 
+ * Sun Sep 12 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.7-5
+ - Shorten the package descriptions
+ 
+ * Sun Sep 12 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.7-4
+ - Match the BuildRequires versions with the Requires
+ 
  * Mon Aug 30 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.7-3
 -- Transitional build for the update of nss to 3.12.7
 -
 -* Mon Aug 30 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.7-3
 -- Relax the build requires on nss-util-devel and increase on nspr-devel
 -
 -* Sat Aug 29 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.7-2
 +- 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