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

[Fabio M. Di Nitto]

Author: fabbione

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

Modified Files:
	resource-agents.spec 
Log Message:
Drop Conflicts with rgmanager



Index: resource-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/devel/resource-agents.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- resource-agents.spec	24 Feb 2009 12:37:00 -0000	1.1
+++ resource-agents.spec	24 Feb 2009 12:39:24 -0000	1.2
@@ -19,7 +19,7 @@
 Name: resource-agents
 Summary: Open Source HA Resource 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/
@@ -29,13 +29,6 @@
 Requires: bash grep sed gawk
 Requires: net-tools mount e2fsprogs
 
-# Since rgmanager <= 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, rgmanager will
-# Requires: resource-agents in the right version and this Conflicts will
-# be dropped as mandated by Fedora Packing policies.
-Conflicts: rgmanager <= 3.0.0-4.alpha4
-
 ## Setup/build bits
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -79,6 +72,9 @@
 %{_datadir}/cluster
 
 %changelog
+* Tue Feb 24 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-4.alpha5
+- Drop Conflicts with rgmanager.
+
 * Mon Feb 23 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-3.alpha5
 - New upstream release.