[nss-softokn/f14/master] Fix a dependency line and fix descriptions to keep rpmlint happy

[Elio Maldonado]

commit 098f6ced18608facd075e1c63e14e09e7f6fedf7
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Tue Sep 28 09:46:52 2010 -0700

    Fix a dependency line and fix descriptions to keep rpmlint happy
    
    Fix nss-util-devel version dependency line
    Shorten freebl and freebl subpackages descriptions
    
    Conflicts:
    
    	nss-softokn.spec

 nss-softokn.spec |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/nss-softokn.spec b/nss-softokn.spec
index a2a6155..47a8223 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -17,7 +17,7 @@
 Summary:          Network Security Services Softoken Module
 Name:             nss-softokn
 Version:          3.12.7
-Release:          6%{?dist}
+Release:          7%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -35,7 +35,7 @@ BuildRequires:    psmisc
 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, 
 # Therefore we use the nss-split-softokn.sh script to keep only what we need.
 # 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:
@@ -44,7 +44,7 @@ Source0:          %{name}-%{version}-stripped.tar.bz2
 # cd nss-softokn
 # cp ../../nss/devel/${version}-stripped.tar.bz2  .
 # sh ./nss-split-softokn.sh ${version}
-# 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
@@ -71,6 +71,7 @@ library.
 %package freebl-devel
 Summary:          Header and Library files for doing development with the Freebl library for NSS
 Group:            System Environment/Base
+Provides:         nss-softokn-freebl-static = %{version}-%{release}
 Requires:         nss-softokn-freebl%{?_isa} = %{version}-%{release}
 
 %description freebl-devel
@@ -312,6 +313,10 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* 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}