rpms/nss-softokn/F-13 nss-softokn.spec,1.35,1.36

[Elio Maldonado]

Author: emaldonado

Update of /cvs/pkgs/rpms/nss-softokn/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1835

Modified Files:
	nss-softokn.spec 
Log Message:
Add %{?_isa} to the requires in the devel packages (#596840)


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss-softokn/F-13/nss-softokn.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- nss-softokn.spec	11 May 2010 15:05:40 -0000	1.35
+++ nss-softokn.spec	3 Jun 2010 00:00:57 -0000	1.36
@@ -1,4 +1,4 @@
-%global nspr_version 4.8.2
+%global nspr_version 4.8.4
 %global nss_name nss
 %global nss_softokn_fips_version 3.12.4
 %global nss_util_version 3.12.4
@@ -15,10 +15,10 @@
     $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libnssdbm3.so \
 %{nil}
 
-Summary:          Network Security Services Soktoken Module
+Summary:          Network Security Services Softoken Module
 Name:             nss-softokn
 Version:          3.12.4
-Release:          19%{?dist}
+Release:          20%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -73,7 +73,7 @@ library.
 %package freebl-devel
 Summary:          Header and Library files for doing development with the Freebl library for NSS
 Group:            System Environment/Base
-Requires:         nss-softokn-freebl = %{version}-%{release}
+Requires:         nss-softokn-freebl%{?_isa} = %{version}-%{release}
 
 %description freebl-devel
 Network Security Services Softoken Cryptographic Module Freelb Library Development Tools.
@@ -81,7 +81,7 @@ Network Security Services Softoken Crypt
 %package devel
 Summary:          Development libraries for Network Security Services
 Group:            Development/Libraries
-Requires:         nss-softokn = %{version}-%{release}
+Requires:         nss-softokn%{?_isa} = %{version}-%{release}
 Requires:         nspr-devel >= %{nspr_version}
 Requires:         nss-util-devel >= %{version}
 Requires:         pkgconfig
@@ -312,6 +312,11 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Wed Jun 02 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.4-20
+- Add %{?_isa} to the requires in the devel packages (#596840)
+- Fix typo in the package description (#598295)
+- Update nspr version to 4.8.4
+
 * Tue May 11 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.4-19
 - Don't enable FIPS if the kernel doesn't have support for it (rhbz#590199)