Drop temporary Conflicts as it is not required

This commit is contained in:
Fabio M. Di Nitto 2009-02-24 12:33:56 +00:00
parent 3977026fee
commit 7a076f3949

View File

@ -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: sg3_utils OpenIPMI telnet openssh-clients
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 @@ power management for several devices.
%{_mandir}/man8/fence*
%changelog
* Tue Feb 24 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.0-4.alpha5
- Drop Conflicts with cman.
* Mon Feb 23 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.0-3.alpha5
- New upstream release. Also address comments from first package review.