rpms/nss-softokn/devel nss-softokn.spec,1.34,1.35

[Elio Maldonado]

Author: emaldonado

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

Modified Files:
	nss-softokn.spec 
Log Message:
Fix Conflicts line to prevent update when prelink is not yet the right version (rhbz#590199)


Index: nss-softokn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- nss-softokn.spec	19 Apr 2010 18:36:54 -0000	1.34
+++ nss-softokn.spec	8 May 2010 23:13:34 -0000	1.35
@@ -18,7 +18,7 @@
 Summary:          Network Security Services Soktoken Module
 Name:             nss-softokn
 Version:          3.12.4
-Release:          17%{?dist}
+Release:          18%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -61,7 +61,7 @@ Network Security Services Softoken Crypt
 Summary:          Freebl library for the Network Security Services
 Group:            System Environment/Base
 Conflicts:        nss < 3.12.2.99.3-5
-Conflicts:        Prelink < 0.4.3
+Conflicts:        prelink < 0.4.3
 
 %description freebl
 Network Security Services Softoken Cryptographic Module Freelb Library.
@@ -310,6 +310,9 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Sat May 08 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.4-18
+- Fix Conflicts line to prevent update when prelink is not yet the right version (rhbz#590199)
+
 * Mon Apr 19 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.4-17
 - Updated prelink patch rhbz#504949