rpms/nss-softokn/devel nss-softokn.spec,1.14,1.15

[Elio Maldonado]

Author: emaldonado

Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28442

Modified Files:
	nss-softokn.spec 
Log Message:
Use nss_util_version as it may be different than the version for nss-softoken


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- nss-softokn.spec	28 Aug 2009 15:01:17 -0000	1.14
+++ nss-softokn.spec	30 Aug 2009 17:45:15 -0000	1.15
@@ -17,12 +17,12 @@
 Summary:          Network Security Services Soktoken Module
 Name:             nss-softokn
 Version:          3.12.3.99.3
-Release:          22%{?dist}
+Release:          23%{?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 >= %{version}
+Requires:         nss-util >= %{nss_util_version}
 Requires:         nss-softokn-freebl%{_isa} >= %{version}
 Requires:         sqlite
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -108,7 +108,6 @@ export BUILD_OPT
 XCFLAGS=$RPM_OPT_FLAGS
 export XCFLAGS
 
-
 PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
 PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
 
@@ -139,13 +138,15 @@ export USE_64
 %{__make} -C ./mozilla/security/nss
 
 # Set up our package file
+# The nspr_version and nss_util_version globals used here
+# must match the ones nss-softokn has for its Requires. 
 %{__mkdir_p} ./mozilla/dist/pkgconfig
 %{__cat} %{SOURCE2} | sed -e "s,%%libdir%%,%{_libdir},g" \
                           -e "s,%%prefix%%,%{_prefix},g" \
                           -e "s,%%exec_prefix%%,%{_prefix},g" \
                           -e "s,%%includedir%%,%{_includedir}/nss3,g" \
                           -e "s,%%NSPR_VERSION%%,%{nspr_version},g" \
-                          -e "s,%%NSSUTIL_VERSION%%,%{version},g" \
+                          -e "s,%%NSSUTIL_VERSION%%,%{nss_util_version},g" \
                           -e "s,%%SOFTOKEN_VERSION%%,%{version},g" > \
                           ./mozilla/dist/pkgconfig/nss-softokn.pc
 
@@ -311,6 +312,9 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Sun Aug 30 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-23
+- Explicitly state via nss_util_version the nss-util version we require
+
 * Fri Aug 28 2009 Warren Togami <wtogami at redhat.com> - 3.12.3.99.3-22
 - caolan's nss-softokn.pc patch