rpms/nss/devel nss.spec,1.149,1.150

[Elio Maldonado]

Author: emaldonado

Update of /cvs/pkgs/rpms/nss/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26542

Modified Files:
	nss.spec 
Log Message:
Require nss-softoken 3.12.6


Index: nss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss/devel/nss.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- nss.spec	7 Jun 2010 04:41:51 -0000	1.149
+++ nss.spec	8 Jun 2010 19:01:01 -0000	1.150
@@ -1,23 +1,22 @@
 %global nspr_version 4.8.4
 %global nss_util_version 3.12.6
-%global nss_softokn_version 3.12.4
-%global nss_softokn_fips_version 3.12.4
+%global nss_softokn_version 3.12.6
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.6
-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
 Requires:         nspr >= %{nspr_version}
 Requires:         nss-util = %{nss_util_version}
-Requires:         nss-softokn%{_isa} = %{nss_softokn_fips_version}
+Requires:         nss-softokn%{_isa} = %{nss_softokn_version}
 Requires:         nss-system-init
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    nspr-devel >= %{nspr_version}
-BuildRequires:    nss-softokn-devel = %{nss_softokn_version}                                                  
+BuildRequires:    nss-softokn-devel = 3.12.4
 BuildRequires:    nss-util-devel = %{nss_util_version}
 BuildRequires:    sqlite-devel
 BuildRequires:    zlib-devel
@@ -488,6 +487,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Tue Jun 08 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.6-7
+- Require nss-softoken 3.12.6
+
 * Sun Jun 06 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.6-6
 - Fix SIGSEGV within CreateObject (#596674)