rpms/fence-agents/devel fence-agents.spec,1.1,1.2

[Fabio M. Di Nitto]

Author: fabbione

Update of /cvs/pkgs/rpms/fence-agents/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1456

Modified Files:
	fence-agents.spec 
Log Message:
Drop temporary Conflicts as it is not required



Index: fence-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/devel/fence-agents.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fence-agents.spec	24 Feb 2009 12:30:04 -0000	1.1
+++ fence-agents.spec	24 Feb 2009 12:33:56 -0000	1.2
@@ -19,7 +19,7 @@
 Name: fence-agents
 Summary: Fence Agents for Red Hat Cluster
 Version: 3.0.0
-Release: 3%{?alphatag:.%{alphatag}}%{?dist}
+Release: 4%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -30,13 +30,6 @@
 Requires: pexpect net-snmp-utils pyOpenSSL
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-# Since cman <= 3.0.0-4.alpha4 and this package conflicts at file level,
-# I am adding a temporary Conflicts so that testers will not attempt
-# to install it. Once the package is approved, cman will Requires: fence-agents
-# in the right version and this Conflicts will be dropped as mandated by
-# Fedora Packing policies.
-Conflicts: cman <= 3.0.0-4.alpha4
-
 ## Setup/build bits
 
 # build support for virtualization
@@ -118,6 +111,9 @@
 %{_mandir}/man8/fence*
 
 %changelog
+* Tue Feb 24 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-4.alpha5
+- Drop Conflicts with cman.
+
 * Mon Feb 23 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-3.alpha5
 - New upstream release. Also address comments from first package review.