rpms/nss-softokn/devel nss-softokn.spec,1.4,1.5

[Elio Maldonado]

Author: emaldonado

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

Modified Files:
	nss-softokn.spec 
Log Message:
Fixed Requires nss-util and BuildRequires nss-util-devel >= %{version}, added BuildRequire nss version >= nss-version-with-subpackages, replaced a rm with %{__rm}


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nss-softokn.spec	20 Aug 2009 22:14:00 -0000	1.4
+++ nss-softokn.spec	25 Aug 2009 18:49:49 -0000	1.5
@@ -17,17 +17,17 @@
 Summary:          Network Security Services Soktoken Module
 Name:             nss-softokn
 Version:          3.12.3.99.3
-Release:          9%{?dist}
+Release:          10%{?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-softokn-freebl%{_isa} >= %{version}
 Requires:         sqlite
-Requires:         nss-util >= %{nssutil_version}
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    nspr-devel >= %{nspr_version}
-BuildRequires:    nss-util-devel >= %{nssutil_version}
+BuildRequires:    nss-util-devel >= %{version}
 BuildRequires:    sqlite-devel
 BuildRequires:    zlib-devel
 BuildRequires:    pkgconfig
@@ -76,8 +76,12 @@ Summary:          Development libraries 
 Group:            Development/Libraries
 Requires:         nss-softokn = %{version}-%{release}
 Requires:         nspr-devel >= %{nspr_version}
-Requires:         nss-util-devel >= %{nsutil_version}
+Requires:         nss-util-devel >= %{version}
 Requires:         pkgconfig
+BuildRequires:    nspr-devel >= %{nspr_version}
+BuildRequires:    nss-util-devel >= %{version}
+# require nss at least the version when we split via subpackages
+BuildRequires:    nss-devel >= 3.12.2.99.3-11
 
 %description devel
 Header and Library files for doing development with Network Security Services.
@@ -250,7 +254,7 @@ done
 
 %postun
 /sbin/ldconfig >/dev/null 2>/dev/null
-[ $1 = 0 ] && rm -f %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
+[ $1 = 0 ] && %{__rm} -f %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
 
 
 %files
@@ -306,6 +310,9 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Tue Aug 25 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-10
+Build after nss with subpackages and new nss-util
+
 * Thu Aug 20 2009 Dennis Gilmore <dennis at ausil.us> 3.12.3.99.3-9
 - revert to shipping bits