From 33e494ebf14ec41e0e5d5c75eea9f08ba3fd6250 Mon Sep 17 00:00:00 2001 From: Marek 'marx' Grac Date: Wed, 27 Aug 2014 16:36:58 +0200 Subject: [PATCH] new upstream release --- .gitignore | 1 + fence-agents.spec | 32 +++++++--- scsi_check.patch | 151 ---------------------------------------------- sources | 2 +- 4 files changed, 24 insertions(+), 162 deletions(-) delete mode 100644 scsi_check.patch diff --git a/.gitignore b/.gitignore index f632443..04a569d 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ fence-agents-3.0.14.tar.bz2 /fence-agents-4.0.8.tar.xz /fence-agents-4.0.9.tar.xz /fence-agents-4.0.10.tar.xz +/fence-agents-4.0.11.tar.xz diff --git a/fence-agents.spec b/fence-agents.spec index faed455..5ea0ea3 100644 --- a/fence-agents.spec +++ b/fence-agents.spec @@ -15,19 +15,17 @@ Name: fence-agents Summary: Fence Agents for Red Hat Cluster -Version: 4.0.10 -Release: 2%{?alphatag:.%{alphatag}}%{?dist} +Version: 4.0.11 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Base URL: http://sourceware.org/cluster/wiki/ Source0: https://fedorahosted.org/releases/f/e/fence-agents/%{name}-%{version}.tar.xz -Patch0: scsi_check.patch - %if 0%{?fedora} -%global supportedagents alom amt apc apc_snmp bladecenter brocade cisco_mds cisco_ucs docker 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 supportedagents alom amt apc apc_snmp bladecenter brocade cisco_mds cisco_ucs docker drac5 eaton_snmp eps hpblade ibmblade ifmib ilo ilo_mp ilo_moonshot 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-docker 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 +%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-docker 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-ilo-moonshot 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 ## Setup/build bits @@ -42,7 +40,6 @@ BuildRequires: python pexpect python-pycurl python-suds %prep %setup -q -n %{name}-%{version} -%patch0 -p1 %build %{configure} --with-agents='%{supportedagents} %{testagents}' @@ -146,7 +143,7 @@ Requires: amtterm Requires: fence-agents-common = %{version}-%{release} Obsoletes: fence-agents %description amt -The fence-agents-apc package contains a fence agent for AMT compatibile devices that are accessed via 3rd party software. +The fence-agents-amt package contains a fence agent for AMT compatibile devices that are accessed via 3rd party software. %files amt %defattr(-,root,root,-) %{_sbindir}/fence_amt @@ -336,6 +333,20 @@ The fence-agents-ilo-mp package contains a fence agent for HP iLO MP devices tha %{_sbindir}/fence_ilo_mp %{_mandir}/man8/fence_ilo_mp.8* +%package ilo-moonshot +License: GPLv2+ and LGPLv2+ +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 +%defattr(-,root,root,-) +%{_sbindir}/fence_ilo_moonshot +%{_mandir}/man8/fence_ilo_moonshot.8* + %package intelmodular License: GPLv2+ and LGPLv2+ Group: System Environment/Base @@ -609,8 +620,9 @@ The fence-agents-wti package contains a fence agent for WTI network power switch %{_mandir}/man8/fence_wti.8* %changelog -* Sat Aug 16 2014 Fedora Release Engineering -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild +* Wed Aug 27 2014 Marek Grac - 4.0.10 +- new upstream release +- new package fence-agents-ilo-moonshot * Sat Jun 07 2014 Fedora Release Engineering - 4.0.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/scsi_check.patch b/scsi_check.patch deleted file mode 100644 index ab03ecf..0000000 --- a/scsi_check.patch +++ /dev/null @@ -1,151 +0,0 @@ -diff -urN fence-agents-4.0.10/fence/agents/scsi/Makefile.am fence-agents-4.0.10.new/fence/agents/scsi/Makefile.am ---- fence-agents-4.0.10/fence/agents/scsi/Makefile.am 2014-07-01 12:53:45.000000000 +0200 -+++ fence-agents-4.0.10.new/fence/agents/scsi/Makefile.am 2014-07-01 14:35:25.000000000 +0200 -@@ -4,16 +4,20 @@ - - SRC = $(TARGET).py - --EXTRA_DIST = $(SRC) -+EXTRA_DIST = $(SRC) \ -+ fence_scsi_check - --sbin_SCRIPTS = $(TARGET) fence_scsi_check -+scsidatadir = $(CLUSTERDATA) -+scsidata_SCRIPTS = fence_scsi_check -+ -+sbin_SCRIPTS = $(TARGET) - - man_MANS = $(TARGET).8 - - FENCE_TEST_ARGS = -k 1 - - fence_scsi_check: $(TARGET) -- cp -s $^ $@ -+ cp $^ $@ - - include $(top_srcdir)/make/fencebuild.mk - include $(top_srcdir)/make/fenceman.mk -diff -urN fence-agents-4.0.10/fence/agents/scsi/Makefile.in fence-agents-4.0.10.new/fence/agents/scsi/Makefile.in ---- fence-agents-4.0.10/fence/agents/scsi/Makefile.in 2014-07-01 13:29:55.000000000 +0200 -+++ fence-agents-4.0.10.new/fence/agents/scsi/Makefile.in 2014-07-01 14:35:36.000000000 +0200 -@@ -121,8 +121,9 @@ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } --am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)" --SCRIPTS = $(sbin_SCRIPTS) -+am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(scsidatadir)" \ -+ "$(DESTDIR)$(man8dir)" -+SCRIPTS = $(sbin_SCRIPTS) $(scsidata_SCRIPTS) - AM_V_P = $(am__v_P_@AM_V@) - am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) - am__v_P_0 = false -@@ -284,8 +285,12 @@ - MAINTAINERCLEANFILES = Makefile.in - TARGET = fence_scsi - SRC = $(TARGET).py --EXTRA_DIST = $(SRC) --sbin_SCRIPTS = $(TARGET) fence_scsi_check -+EXTRA_DIST = $(SRC) \ -+ fence_scsi_check -+ -+scsidatadir = $(CLUSTERDATA) -+scsidata_SCRIPTS = fence_scsi_check -+sbin_SCRIPTS = $(TARGET) - man_MANS = $(TARGET).8 - FENCE_TEST_ARGS = -k 1 - TEMPFILE := $(shell mktemp) -@@ -359,6 +364,41 @@ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 's,.*/,,;$(transform)'`; \ - dir='$(DESTDIR)$(sbindir)'; $(am__uninstall_files_from_dir) -+install-scsidataSCRIPTS: $(scsidata_SCRIPTS) -+ @$(NORMAL_INSTALL) -+ @list='$(scsidata_SCRIPTS)'; test -n "$(scsidatadir)" || list=; \ -+ if test -n "$$list"; then \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(scsidatadir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(scsidatadir)" || exit 1; \ -+ fi; \ -+ for p in $$list; do \ -+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -+ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ -+ done | \ -+ sed -e 'p;s,.*/,,;n' \ -+ -e 'h;s|.*|.|' \ -+ -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ -+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ -+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ -+ if ($$2 == $$4) { files[d] = files[d] " " $$1; \ -+ if (++n[d] == $(am__install_max)) { \ -+ print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ -+ else { print "f", d "/" $$4, $$1 } } \ -+ END { for (d in files) print "f", d, files[d] }' | \ -+ while read type dir files; do \ -+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ -+ test -z "$$files" || { \ -+ echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(scsidatadir)$$dir'"; \ -+ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(scsidatadir)$$dir" || exit $$?; \ -+ } \ -+ ; done -+ -+uninstall-scsidataSCRIPTS: -+ @$(NORMAL_UNINSTALL) -+ @list='$(scsidata_SCRIPTS)'; test -n "$(scsidatadir)" || exit 0; \ -+ files=`for p in $$list; do echo "$$p"; done | \ -+ sed -e 's,.*/,,;$(transform)'`; \ -+ dir='$(DESTDIR)$(scsidatadir)'; $(am__uninstall_files_from_dir) - - mostlyclean-libtool: - -rm -f *.lo -@@ -449,7 +489,7 @@ - check: check-am - all-am: Makefile $(SCRIPTS) $(MANS) - installdirs: -- for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)"; do \ -+ for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(scsidatadir)" "$(DESTDIR)$(man8dir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done - install: install-am -@@ -503,7 +543,7 @@ - - info-am: - --install-data-am: install-man -+install-data-am: install-man install-scsidataSCRIPTS - - install-dvi: install-dvi-am - -@@ -547,7 +587,8 @@ - - ps-am: - --uninstall-am: uninstall-man uninstall-sbinSCRIPTS -+uninstall-am: uninstall-man uninstall-sbinSCRIPTS \ -+ uninstall-scsidataSCRIPTS - - uninstall-man: uninstall-man8 - -@@ -560,16 +601,16 @@ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-man8 install-pdf install-pdf-am install-ps \ -- install-ps-am install-sbinSCRIPTS install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ -- uninstall-am uninstall-man uninstall-man8 \ -- uninstall-sbinSCRIPTS -+ install-ps-am install-sbinSCRIPTS install-scsidataSCRIPTS \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ tags-am uninstall uninstall-am uninstall-man uninstall-man8 \ -+ uninstall-sbinSCRIPTS uninstall-scsidataSCRIPTS - - - fence_scsi_check: $(TARGET) -- cp -s $^ $@ -+ cp $^ $@ - $(TARGET): $(SRC) - bash $(top_srcdir)/scripts/fenceparse \ - $(top_srcdir)/make/copyright.cf REDHAT_COPYRIGHT \ diff --git a/sources b/sources index 2109457..ead0ebe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3e7466a507f10cc5d2c3e49da84946f9 fence-agents-4.0.10.tar.xz +8d3d72670e836782ef97ada368484ef1 fence-agents-4.0.11.tar.xz