[nss-softokn/f13/master: 19/19] Selective merge from f14

[Elio Maldonado]

commit a8bfc7608232187be6ba790ea1c9962b783e6bcd
Merge: f3e5fbb f981b5e
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Fri Feb 25 08:43:59 2011 -0800

    Selective merge from f14

 .gitignore       |    2 +-
 nss-softokn.spec |   35 +++++++++++++++++++++++++++--------
 sources          |    2 +-
 3 files changed, 29 insertions(+), 10 deletions(-)
---
diff --cc nss-softokn.spec
index 7ffffd3,e075caa..7f6a29d
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@@ -312,27 -321,55 +321,37 @@@ don
  %{_includedir}/nss3/shsign.h
  
  %changelog
 -* Sat Feb 19 2011 Elio Maldonado <emaldona at redhat.com> - 3.12.9-4
 -- Retagging
 -
 -* Mon Feb 14 2011 Elio Maldonado <emaldona at redhat.com> - 3.12.9-3
++* Sat Feb 25 2011 Elio Maldonado <emaldona at redhat.com> - 3.12.9-4
++- Merge from f14
+ - Expand the nss-softokn-freebl-devel package description (#675196)
 -- Move blapit.h to freebl-devel list and remove duplicates
 -
 -* Fri Feb 04 2011 Elio Maldonado <emaldona at redhat.com> - 3.12.9-2
++- Move blapit.h to freebl-devel list and remove duplicates (#675196)
+ - Add header for nss-softokn-freebl-devel (#675196)
 -
 -* Wed Jan 12 2011 Elio Maldonado <emaldona at redhat.com> - 3.12.9-1
+ - Update to 3.12.9
 -
 -* Mon Dec 27 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.9-0.1.beta2
 -- Rebuilt according to fedora pre-release package naming guidelines
 -
 -* Fri Dec 10 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.8.99.2-1
 -- Update to NSS_3_12_9_BETA2
 -
 -* Wed Dec 08 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.8.99.1-1
 -- Update to NSS_3_12_9_BETA1
 -
 -* Wed Sep 29 2010 jkeating - 3.12.8-2
 -- Rebuilt for gcc bug 634757
 -
 -* Thu Sep 23 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.8-1
 -- Update to 3.12.8
+ - Adhere to static library packaging guidelines (#609613)
+ - Fix nss-util-devel version dependency line
+ - Shorten freebl and freebl subpackages descriptions
+ 
 -* Sat Sep 18 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.99.4-1
 -- NSS 3.12.8 RC0
 +* Tue Sep 28 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.8-1
 +- Update to 3.12.8
 +
 +* Tue Sep 28 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.7-7
 +- Add provides nss-softokn-freebl-static to adhere to static library packaging guidelines (#609613)
 +- Cleanup some comments to address rpmlint warnings
  
 -* Sat Sep 12 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.7.99.3-2
 -- Update the required version of nss-util to 3.12.7.99.3
 +* Sun Sep 12 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.7-6
 +- Fix BuildRequires: nss-util-devel to be >= {nss_util_version}
  
 -* Sat Sep 04 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.7.99.3-1
 -- NSS 3.12.8 Beta 3
 +* 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
 +- 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