From d34a47e4db1fac2a136b7c92f1aa7aff4ffa0cb5 Mon Sep 17 00:00:00 2001
From: Marek 'marx' Grac <mgrac@redhat.com>
Date: Mon, 19 Sep 2016 15:10:09 +0200
Subject: [PATCH] Remove obsoletes that are no longer required

---
 fence-agents.spec | 54 ++++-------------------------------------------
 1 file changed, 4 insertions(+), 50 deletions(-)

diff --git a/fence-agents.spec b/fence-agents.spec
index 0e7623e..486e7af 100644
--- a/fence-agents.spec
+++ b/fence-agents.spec
@@ -16,7 +16,7 @@
 Name: fence-agents
 Summary: Fence Agents for Red Hat Cluster
 Version: 4.0.24
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Release: 3%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sourceware.org/cluster/wiki/
@@ -107,7 +107,6 @@ Group: System Environment/Base
 Summary: Fence agent for SUN ALOM
 Requires: telnet openssh-clients
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description alom
 Red Hat Fence Agents
 %files alom
@@ -122,7 +121,6 @@ Group: System Environment/Base
 Summary: Fence agent for APC devices
 Requires: telnet openssh-clients
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description apc
 The fence-agents-apc package contains a fence agent for APC devices that are accessed via telnet or SSH. 
 %files apc 
@@ -136,7 +134,6 @@ Group: System Environment/Base
 Summary: Fence agent for APC devices (SNMP)
 Requires: net-snmp-utils
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description apc-snmp
 The fence-agents-apc-snmp package contains a fence agent for APC devices that are accessed via the SNMP protocol. 
 %files apc-snmp
@@ -152,7 +149,6 @@ Group: System Environment/Base
 Summary: Fence agent for Intel AMT devices 
 Requires: amtterm
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description amt
 The fence-agents-amt package contains a fence agent for AMT compatibile devices that are accessed via 3rd party software. 
 %files amt
@@ -166,7 +162,6 @@ Group: System Environment/Base
 Summary: Fence agent for Intel AMT (WS-Man) devices
 Requires: fence-agents-common >= %{version}-%{release}
 Requires: openwsman-python3
-Obsoletes: fence-agents
 %description amt-ws
 The fence-agents-amt-ws package contains a fence agent for AMT (WS-Man) devices.
 %files amt-ws
@@ -180,7 +175,6 @@ Group: System Environment/Base
 Summary: Fence agent for IBM BladeCenter 
 Requires: telnet openssh-clients
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description bladecenter
 The fence-agents-bladecenter package contains a fence agent for IBM BladeCenter devices that are accessed via telnet or SSH.
 %files bladecenter
@@ -194,7 +188,6 @@ Group: System Environment/Base
 Summary: Fence agent for Brocade switches
 Requires: telnet openssh-clients
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description brocade
 The fence-agents-bladecenter package contains a fence agent for Brocade devices that are accessed via telnet or SSH.
 %files brocade
@@ -208,7 +201,6 @@ Group: System Environment/Base
 Summary: Fence agent for Cisco MDS 9000 series
 Requires: net-snmp-utils
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description cisco-mds
 The fence-agents-cisco-mds package contains a fence agent for Cisco MDS 9000 series devices that are accessed via the SNMP protocol.
 %files cisco-mds
@@ -222,7 +214,6 @@ Group: System Environment/Base
 Summary: Fence agent for Cisco UCS series
 Requires: python3-pycurl
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description cisco-ucs
 The fence-agents-cisco-ucs package contains a fence agent for Cisco UCS series devices that are accessed via the SNMP protocol.
 %files cisco-ucs
@@ -236,7 +227,6 @@ Group: System Environment/Base
 Summary: Fence agent for Nova compute nodes
 Requires: python-requests
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description compute
 The fence-agents-compute package contains a fence agent for Nova compute nodes.
 %files compute
@@ -250,7 +240,6 @@ Group: System Environment/Base
 Summary: Fence agent for Docker
 Requires: python3-pycurl
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description docker
 The fence-agents-docker package contains a fence agent for Docker images that are accessed over HTTP.
 %files docker
@@ -265,7 +254,6 @@ Group: System Environment/Base
 Summary: Fence agent for Dell DRAC
 Requires: telnet
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description drac
 The fence-agents-drac package contains a fence agent for Dell DRAC IV series devices that are accessed via telnet.
 %files drac
@@ -280,7 +268,6 @@ Group: System Environment/Base
 Summary: Fence agent for Dell DRAC 5
 Requires: telnet openssh-clients
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description drac5
 The fence-agents-drac5 package contains a fence agent for Dell DRAC 5 series devices that are accessed via telnet or SSH.
 %files drac5
@@ -294,7 +281,6 @@ Group: System Environment/Base
 Summary: Fence agent for Eaton network power switches
 Requires: net-snmp-utils
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description eaton-snmp
 The fence-agents-eaton-snmp package contains a fence agent for Eaton network power switches that are accessed via the SNMP protocol.
 %files eaton-snmp
@@ -307,7 +293,6 @@ License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 Summary: Fence agent for Emerson devices (SNMP)
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description emerson
 The fence-agents-emerson package contains a fence agent for Emerson devices that are accessed via the SNMP protocol. 
 %files emerson
@@ -320,7 +305,6 @@ License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 Summary: Fence agent for ePowerSwitch 8M+ power switches
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description eps
 The fence-agents-eps package contains a fence agent for ePowerSwitch 8M+ power switches that are accessed via the HTTP(s) protocol.
 %files eps
@@ -334,7 +318,6 @@ Group: System Environment/Base
 Summary: Fence agent for HP BladeSystem devices
 Requires: telnet openssh-clients
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description hpblade
 The fence-agents-hpblade package contains a fence agent for HP BladeSystem devices that are accessed via telnet or SSH.
 %files hpblade
@@ -349,7 +332,6 @@ Group: System Environment/Base
 Summary: Fence agent for Hitachi Compute Blade systems
 Requires: telnet
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description hds-cb
 The fence-agents-hds-cb package contains a fence agent for Hitachi Compute Blades that are accessed via telnet.
 %files hds-cb
@@ -364,7 +346,6 @@ Group: System Environment/Base
 Summary: Fence agent for IBM BladeCenter
 Requires: net-snmp-utils
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description ibmblade
 The fence-agents-ibmblade package contains a fence agent for IBM BladeCenter devices that are accessed via the SNMP protocol.
 %files ibmblade
@@ -378,7 +359,6 @@ Group: System Environment/Base
 Summary: Fence agent for devices with IF-MIB interfaces
 Requires: net-snmp-utils
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description ifmib
 The fence-agents-ifmib package contains a fence agent for IF-MIB interfaces that are accessed via the SNMP protocol.
 %files ifmib
@@ -392,7 +372,6 @@ Group: System Environment/Base
 Summary: Fence agent for HP iLO2 devices
 Requires: gnutls-utils
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description ilo2
 The fence-agents-ilo2 package contains a fence agent for HP iLO2 devices that are accessed via the HTTP(s) protocol.
 %files ilo2
@@ -408,7 +387,6 @@ Group: System Environment/Base
 Summary: Fence agent for HP iLO MP devices
 Requires: telnet openssh-clients
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description ilo-mp
 The fence-agents-ilo-mp package contains a fence agent for HP iLO MP devices that are accessed via telnet or SSH.
 %files ilo-mp
@@ -422,7 +400,6 @@ Group: System Environment/Base
 Summary: Fence agent for HP iLO Moonshot devices
 Requires: telnet openssh-clients
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description ilo-moonshot
 The fence-agents-ilo-moonshot package contains a fence agent for HP iLO Moonshot devices that are accessed via telnet or SSH.
 %files ilo-moonshot
@@ -436,7 +413,6 @@ Group: System Environment/Base
 Summary: Fence agent for HP iLO devices over SSH
 Requires: openssh-clients
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description ilo-ssh
 The fence-agents-ilo-ssh package contains a fence agent for HP iLO devices that are accessed via telnet or SSH.
 %files ilo-ssh
@@ -454,7 +430,6 @@ Group: System Environment/Base
 Summary: Fence agent for devices with Intel Modular interfaces
 Requires: net-snmp-utils
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description intelmodular
 The fence-agents-intelmodular package contains a fence agent for Intel Modular interfaces that are accessed via the SNMP protocol.
 %files intelmodular
@@ -468,7 +443,6 @@ Group: System Environment/Base
 Summary: Fence agent for IBM iPDU network power switches
 Requires: net-snmp-utils
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description ipdu
 The fence-agents-ipdu package contains a fence agent for IBM iPDU network power switches that are accessed via the SNMP protocol.
 %files ipdu
@@ -482,7 +456,6 @@ Group: System Environment/Base
 Summary: Fence agent for devices with IPMI interface
 Requires: /usr/bin/ipmitool
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description ipmilan
 The fence-agents-ipmilan package contains a fence agent for devices with IPMI interface. 
 %files ipmilan
@@ -503,7 +476,6 @@ License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 Summary: Fence agent for use with kdump crash recovery service
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description kdump
 The fence-agents-kdump package contains a fence agent for use with kdump crash recovery service.
 %files kdump
@@ -520,7 +492,6 @@ Group: System Environment/Base
 Summary: Fence agent for Sun LDom virtual machines
 Requires: telnet openssh-clients
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description ldom
 The fence-agents-ldom package contains a fence agent for APC devices that are accessed via telnet or SSH.
 %files ldom
@@ -536,7 +507,6 @@ Group: System Environment/Base
 Summary: Fence agent for IBM LPAR
 Requires: telnet openssh-clients
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description lpar
 The fence-agents-lpar package contains a fence agent for IBM LPAR devices that are accessed via telnet or SSH.
 %files lpar
@@ -551,7 +521,6 @@ Group: System Environment/Base
 Summary: Fence agent for reservations over Device Mapper Multipath
 Requires: device-mapper-multipath
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description mpath
 The fence-agents-mpath package contains fence agent for SCSI persisent reservation over Device Mapper Multipath
 %files mpath
@@ -566,7 +535,6 @@ Group: System Environment/Base
 Summary: Fence agent for Koukaam NETIO devices
 Requires: telnet openssh-clients
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description netio
 The fence-agents-netio package contains a fence agent for Koukaam NETIO devices that are accessed via telnet or SSH.
 %files netio
@@ -582,7 +550,6 @@ Group: System Environment/Base
 Summary: Fence agent for OVH provider
 Requires: python3-suds
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description ovh
 Red Hat Fence Agent for OVH hosting provider
 %files ovh
@@ -597,7 +564,6 @@ License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 Summary: Fence agent for OVH provider
 Requires: fence-agents-common python3-suds
-Obsoletes: fence-agents
 %description pve
 Red Hat Fence Agent for PVE
 %files pve
@@ -611,7 +577,6 @@ License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 Summary: Fence agent for Raritan Dominion PX
 Requires: fence-agents-common
-Obsoletes: fence-agents
 %description raritan
 Red Hat Fence Agent for Raritan Dominion PX
 %files raritan
@@ -624,7 +589,6 @@ License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 Summary: Fence agent for RCD serial
 Requires: fence-agents-common
-Obsoletes: fence-agents
 %description rcd-serial
 Red Hat Fence Agent for RCD serial 
 %files rcd-serial
@@ -637,7 +601,6 @@ License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 Summary: Fence agent for RHEV-M
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description rhevm
 The fence-agents-rhevm package contains a fence agent for RHEV-M via REST API
 %files rhevm
@@ -652,7 +615,6 @@ Group: System Environment/Base
 Summary: Fence agent for IBM RSA II
 Requires: telnet openssh-clients
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description rsa
 The fence-agents-rsa package contains a fence agent for IBM RSA II devices that are accessed via telnet or SSH.
 %files rsa
@@ -667,7 +629,6 @@ Group: System Environment/Base
 Summary: Fence agent for Fujitsu RSB
 Requires: telnet openssh-clients
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description rsb
 The fence-agents-rsb package contains a fence agent for Fujitsu RSB devices that are accessed via telnet or SSH.
 %files rsb
@@ -682,7 +643,6 @@ Group: System Environment/Base
 Summary: Fence agent for QLogic SANBox2 FC switches
 Requires: telnet
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description sanbox2
 The fence-agents-sanbox2 package contains a fence agent for QLogic SANBox2 switches that are accessed via telnet.
 %files sanbox2
@@ -698,7 +658,6 @@ Group: System Environment/Base
 Summary: Fence agent for SBD (storage-based death)
 Requires: sbd
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description sbd
 The fence-agents-sbd package contains a fence agent for SBD (storage-based death).
 %files sbd
@@ -712,7 +671,6 @@ License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 Summary: Fence agent for SCSI persisent reservations
 Requires: sg3_utils
-Obsoletes: fence-agents
 %description scsi
 The fence-agents-scsi package contains fence agent for SCSI persisent reservations
 %files scsi
@@ -728,7 +686,6 @@ Group: System Environment/Base
 Summary: Fence agent for VirtualBox
 Requires: openssh-clients
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description vbox
 The fence-agents-vbox package contains a fence agent for VirtualBox dom0 accessed via SSH.
 %files vbox
@@ -743,7 +700,6 @@ Group: System Environment/Base
 Summary: Fence agent for virtual machines based on libvirt
 Requires: openssh-clients /usr/bin/virsh
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description virsh
 The fence-agents-virsh package contains a fence agent for virtual machines that are accessed via SSH.
 %files virsh
@@ -758,7 +714,6 @@ Group: System Environment/Base
 Summary: Fence agent for VMWare with VI Perl Toolkit or vmrun
 Requires: python3-pexpect
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description vmware
 The fence-agents-vmware package contains a fence agent for VMWare accessed with VI Perl Toolkit or vmrun.
 %files vmware
@@ -773,7 +728,6 @@ Group: System Environment/Base
 Summary: Fence agent for VMWare with SOAP API v4.1+
 Requires: python3-suds
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description vmware-soap
 The fence-agents-vmware-soap package contains a fence agent for VMWare with SOAP API v4.1+
 %files vmware-soap
@@ -787,7 +741,6 @@ Group: System Environment/Base
 Summary: Fence agent for WTI Network power switches
 Requires: telnet openssh-clients
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description wti
 The fence-agents-wti package contains a fence agent for WTI network power switches that are accessed via telnet or SSH.
 %files wti
@@ -802,7 +755,6 @@ Group: System Environment/Base
 Summary: Fence agent for Citrix XenServer over XenAPI
 Requires: python3-pexpect
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description xenapi
 The fence-agents-xenapi package contains a fence agent for Citrix XenServer accessed over XenAPI.
 %files xenapi
@@ -816,7 +768,6 @@ License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 Summary: Fence agent for IBM z/VM over IP
 Requires: fence-agents-common = %{version}-%{release}
-Obsoletes: fence-agents
 %description zvm
 The fence-agents-zvm package contains a fence agent for IBM z/VM over IP.
 %files zvm
@@ -825,6 +776,9 @@ The fence-agents-zvm package contains a fence agent for IBM z/VM over IP.
 %{_mandir}/man8/fence_zvmip.8*
 
 %changelog
+* Wed Sep 21 2016 Marek Grac <mgrac@redhat.com> - 4.0.24-4
+- Remove Obsoletes that are no longer valid
+
 * Fri Sep  2 2016 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.0.24-2
 - fence-agents-common: add dependency on python3-pycurl