From 60de05859dd0c76fbdc16dcbb13598c13755cc3b Mon Sep 17 00:00:00 2001
From: Marek 'marx' Grac <mgrac@redhat.com>
Date: Mon, 18 Mar 2013 13:32:40 +0100
Subject: [PATCH] minor changes in spec file

---
 fence-agents.spec | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/fence-agents.spec b/fence-agents.spec
index bff32b1..28a141e 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.0
-Release: 1%{?alphatag:.%{alphatag}}%{?dist}
+Release: 2%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sourceware.org/cluster/wiki/
@@ -25,11 +25,13 @@ Source0: https://fedorahosted.org/releases/f/e/fence-agents/%{name}-%{version}.t
 %if 0%{?fedora}
 %global supportedagents alom apc apc_snmp bladecenter cisco_mds cisco_ucs drac5 eaton_snmp eps hpblade ibmblade ifmib ilo ilo_mp intelmodular ipdu ipmilan kdump ldom lpar rhevm rsa rsb scsi vmware_soap wti
 %global testagents virsh
+%global allfenceagents fence-agents-alom fence-agents-apc fence-agents-apc-snmp fence-agents-bladecenter fence-agents-cisco-mds fence-agents-cisco_ucs fence-agents-drac5 fence-agents-eaton-snmp fence-agents-eps fence-agents-hpblade fence-agents-ibmblade fence-agents-ifmib fence-agents-ilo fence-agents-ilo-mp fence-agents-intelmodular fence-agents-ipdu fence-agents-ipmilan fence-agents-kdump fence-agents-ldom fence-agents-lpar fence-agents-rhevm fence-agents-rsa fence-agents-rsb fence-agents-scsi fence-agents-vmware-soap fence-agents-wti
 %endif
 
 %if 0%{?rhel}
 %global supportedagents apc apc_snmp bladecenter cisco_mds cisco_ucs drac5 eaton_snmp eps hpblade ibmblade ifmib ilo ilo_mp intelmodular ipdu ipmilan kdump rhevm rsb scsi vmware_soap wti
 %global testagents virsh
+%global allfenceagents fence-agents-apc fence-agents-apc-snmp fence-agents-bladecenter fence-agents-cisco-mds fence-agents-cisco-ucs fence-agents-drac5 fence-agents-eaton-snmp fence-agents-eps fence-agents-hpblade fence-agents-ibmblade fence-agents-ifmib fence-agents-ilo fence-agents-ilo-mp fence-agents-intelmodular fence-agents-ipdu fence-agents-ipmilan fence-agents-kdump fence-agents-rhevm fence-agents-rsb fence-agents-scsi fence-agents-vmware-soap fence-agents-wti
 %endif
 
 ## Setup/build bits
@@ -42,8 +44,8 @@ BuildRequires: glibc-devel
 BuildRequires: nss-devel nspr-devel
 BuildRequires: libxslt
 BuildRequires: python pexpect python-pycurl python-suds
-BuildRequires: perl-Net-Telnet net-snmp-utils
-BuildRequires: perl-Pod-MinimumVersion
+BuildRequires: perl(Net::Telnet) net-snmp-utils
+BuildRequires: perl(Pod::MinimumVersion)
 
 %prep
 %setup -q -n %{name}-%{version}
@@ -87,29 +89,15 @@ Red Hat Fence Agents is a collection of scripts and libraries to handle remote p
 %{_datadir}/fence/fencing.py
 %{_datadir}/fence/fencing_snmp.py
 
-%if 0%{?fedora}
 %package all
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 Summary: Fence agents
-Requires: fence-agents-alom fence-agents-apc fence-agents-apc-snmp fence-agents-bladecenter fence-agents-cisco-mds fence-agents-cisco-ucs fence-agents-drac5 fence-agents-eaton-snmp fence-agents-eps fence-agents-hpblade fence-agents-ibmblade fence-agents-ifmib fence-agents-ilo-mp fence-agents-intelmodular fence-agents-ipdu fence-agents-ipmilan fence-agents-kdump fence-agents-ldom fence-agents-lpar fence-agents-rhevm fence-agents-rsa fence-agents-rsb fence-agents-scsi fence-agents-vmware-soap fence-agents-wti fence-agents-virsh
+Requires: %{allfenceagents}
 Obsoletes: fence-agents
 %description all
 Red Hat Fence Agents is a collection of all supported fence agents.
 %files all
-%endif
-
-%if 0%{?rhel}
-%package all
-License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
-Summary: Fence agents
-Requires: fence-agents-apc fence-agents-apc-snmp fence-agents-bladecenter fence-agents-cisco-mds fence-agents-cisco-ucs fence-agents-drac5 fence-agents-eaton-snmp fence-agents-eps fence-agents-hpblade fence-agents-ibmblade fence-agents-ifmib fence-agents-ilo-mp fence-agents-intelmodular fence-agents-ipdu fence-agents-ipmilan fence-agents-kdump fence-agents-rhevm fence-agents-rsb fence-agents-scsi fence-agents-vmware-soap fence-agents-wti fence-agents-virsh
-Obsoletes: fence-agents
-%description all
-Red Hat Fence Agents is a collection of all supported fence agents.
-%files all
-%endif
 
 %if 0%{?fedora}
 %package alom
@@ -498,6 +486,9 @@ The fence-agents-wti package contains a fence agent for WTI network power switch
 %{_mandir}/man8/fence_wti.8*
 
 %changelog
+* Mon Mar 18 2013 Marek Grac <mgrac@redhat.com> - 4.0.0-2
+- minor changes in spec file
+
 * Mon Mar 11 2013 Marek Grac <mgrac@redhat.com> - 4.0.0-1
 - new upstream release
 - introducing subpackages