Merge branch 'master' into f20

This commit is contained in:
Marek 'marx' Grac 2014-05-16 13:20:28 +02:00
commit a610cfe5ef
3 changed files with 23 additions and 3 deletions

1
.gitignore vendored
View File

@ -23,3 +23,4 @@ fence-agents-3.0.14.tar.bz2
/fence-agents-4.0.6.tar.xz
/fence-agents-4.0.7.tar.xz
/fence-agents-4.0.8.tar.xz
/fence-agents-4.0.9.tar.xz

View File

@ -15,7 +15,7 @@
Name: fence-agents
Summary: Fence Agents for Red Hat Cluster
Version: 4.0.8
Version: 4.0.9
Release: 1%{?alphatag:.%{alphatag}}%{?dist}
License: GPLv2+ and LGPLv2+
Group: System Environment/Base
@ -23,7 +23,7 @@ URL: http://sourceware.org/cluster/wiki/
Source0: https://fedorahosted.org/releases/f/e/fence-agents/%{name}-%{version}.tar.xz
%if 0%{?fedora}
%global supportedagents alom amt apc apc_snmp bladecenter brocade cisco_mds cisco_ucs drac5 eaton_snmp eps hpblade ibmblade ifmib ilo ilo_mp intelmodular ipdu ipmilan kdump ldom lpar netio ovh rhevm rsa rsb scsi vmware_soap wti
%global supportedagents alom amt apc apc_snmp bladecenter brocade cisco_mds cisco_ucs drac5 eaton_snmp eps hpblade ibmblade ifmib ilo ilo_mp intelmodular ipdu ipmilan kdump ldom lpar netio ovh pve rhevm rsa rsb scsi vmware_soap wti
%global testagents virsh raritan
%global allfenceagents fence-agents-alom fence-agents-amt fence-agents-apc fence-agents-apc-snmp fence-agents-bladecenter fence-agents-brocade 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-ilo2 fence-agents-ilo-mp fence-agents-intelmodular fence-agents-ipdu fence-agents-ipmilan fence-agents-kdump fence-agents-ldom fence-agents-lpar fence-agents-netio fence-agents-ovh fence-agents-rhevm fence-agents-rsa fence-agents-rsb fence-agents-scsi fence-agents-vmware-soap fence-agents-wti
%endif
@ -451,6 +451,21 @@ Red Hat Fence Agent for OVH hosting provider
%{_mandir}/man8/fence_ovh.8*
%endif
%if 0%{?fedora}
%package pve
License: GPLv2+ and LGPLv2+
Group: System Environment/Base
Summary: Fence agent for OVH provider
Requires: fence-agents-common python-suds
Obsoletes: fence-agents
%description pve
Red Hat Fence Agent for PVE
%files pve
%defattr(-,root,root,-)
%{_sbindir}/fence_pve
%{_mandir}/man8/fence_pve.8*
%endif
%package raritan
License: GPLv2+ and LGPLv2+
Group: System Environment/Base
@ -580,6 +595,10 @@ The fence-agents-wti package contains a fence agent for WTI network power switch
%{_mandir}/man8/fence_wti.8*
%changelog
* Fri May 16 2014 Marek Grac <mgrac@redhat.com> - 4.0.9
- new upstream release
- new package fence-agents-pve
* Mon Apr 07 2014 Marek Grac <mgrac@redhat.com> - 4.0.8-1
- new upstream release
- new package fence-agents-raritan

View File

@ -1 +1 @@
13334ea0477dfde9b876ddeee4b61aa8 fence-agents-4.0.8.tar.xz
3fe0b42e3d0dc691866940c695ccbf7d fence-agents-4.0.9.tar.xz