From 6eef531c067ef908748ff860bd25419627e61995 Mon Sep 17 00:00:00 2001 From: "Fabio M. Di Nitto" Date: Tue, 24 Feb 2009 12:39:24 +0000 Subject: [PATCH] Drop Conflicts with rgmanager --- resource-agents.spec | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/resource-agents.spec b/resource-agents.spec index 7b99762..dced664 100644 --- a/resource-agents.spec +++ b/resource-agents.spec @@ -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 @@ Source0: ftp://sources.redhat.com/pub/cluster/releases/resource-agents-%{version 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 @@ services to operate in a High Availability environment. %{_datadir}/cluster %changelog +* Tue Feb 24 2009 Fabio M. Di Nitto - 3.0.0-4.alpha5 +- Drop Conflicts with rgmanager. + * Mon Feb 23 2009 Fabio M. Di Nitto - 3.0.0-3.alpha5 - New upstream release.