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

[Elio Maldonado]

commit 7b50aa49ca19a7472b0254d7df6ba7e4b35a2d08
Merge: 7df266e f3e5fbb
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Mon Oct 4 13:46:49 2010 -0700

    Merge branch 'f13' into f12
    
    Update to 3.12.8
    Add provides nss-softokn-freebl-static to adhere to static library packaging guidelines (#609613)
    Cleanup some comments to address rpmlint warnings

 freebl-no-depend.patch            |   33 ---------------------------------
 nss-softokn-3.12.4-fips-fix.patch |    5 +++--
 nss-softokn-3.12.4-prelink.patch  |   22 +++++++++++-----------
 nss-softokn.spec                  |   16 ++++++++++------
 sources                           |    2 +-
 5 files changed, 25 insertions(+), 53 deletions(-)
---
diff --cc nss-softokn.spec
index a0cb78d,7ffffd3..dec6a35
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@@ -287,6 -312,13 +286,11 @@@ don
  %{_includedir}/nss3/shsign.h
  
  %changelog
+ * 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
+ 
  * Sun Sep 12 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.7-6
  - Fix BuildRequires: nss-util-devel to be >= {nss_util_version}