new upstream release

This commit is contained in:
Marek 'marx' Grac 2015-02-09 17:18:11 +01:00
parent 1a50c10c5f
commit 7122744428
4 changed files with 8 additions and 31 deletions

1
.gitignore vendored
View File

@ -27,3 +27,4 @@ fence-agents-3.0.14.tar.bz2
/fence-agents-4.0.10.tar.xz
/fence-agents-4.0.11.tar.xz
/fence-agents-4.0.14.tar.xz
/fence-agents-4.0.15.tar.xz

View File

@ -15,13 +15,12 @@
Name: fence-agents
Summary: Fence Agents for Red Hat Cluster
Version: 4.0.14
Version: 4.0.15
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: makefile-awk.patch
%if 0%{?fedora}
%global supportedagents alom amt apc apc_snmp bladecenter brocade cisco_mds cisco_ucs docker drac5 eaton_snmp emerson eps hpblade ibmblade ifmib ilo ilo_mp ilo_ssh ilo_moonshot intelmodular ipdu ipmilan kdump ldom lpar netio ovh pve rhevm rsa rsb scsi vmware_soap wti
@ -42,7 +41,6 @@ BuildRequires: autoconf automake libtool
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .makefile-awk
%build
./autogen.sh
@ -138,6 +136,8 @@ The fence-agents-apc-snmp package contains a fence agent for APC devices that ar
%defattr(-,root,root,-)
%{_sbindir}/fence_apc_snmp
%{_mandir}/man8/fence_apc_snmp.8*
%{_sbindir}/fence_tripplite_snmp
%{_mandir}/man8/fence_tripplite_snmp.8*
%package amt
License: GPLv2+ and LGPLv2+
@ -668,6 +668,9 @@ The fence-agents-zvm package contains a fence agent for IBM z/VM over IP.
%{_mandir}/man8/fence_zvmip.8*
%changelog
* Mon Feb 09 2015 Marek Grac <mgrac@redhat.com> - 4.0.15-1
- new upstream release
* Thu Jan 08 2015 Marek Grac <mgrac@redhat.com> - 4.0.14-1
- new upstream release
- new packages fence-agents-zvm and fence-agents-emerson

View File

@ -1,27 +0,0 @@
diff --git a/make/agentpycheck.mk b/make/agentpycheck.mk
index 090116b..291e242 100644
--- a/make/agentpycheck.mk
+++ b/make/agentpycheck.mk
@@ -1,19 +1,19 @@
TEMPFILE:=$(shell mktemp)
#DATADIR:=$(abs_top_builddir)/tests/data/metadata
DATADIR:=$(abs_top_srcdir)/tests/data/metadata
-AWK='BEGIN {store=-1} /name=\"store_path\"/ {store=2} {if (store!=0) {print}; store--}'
+AWK_VAL='BEGIN {store=-1} /name=\"store_path\"/ {store=2} {if (store!=0) {print}; store--}'
check: $(TARGET:%=xml-check.%) $(SYMTARGET:%=xml-check.%) $(TARGET:%=delay-check.%)
xml-check.%: %
$(eval INPUT=$(subst xml-check.,,$@))
- PYTHONPATH=$(abs_srcdir)/../lib:$(abs_builddir)/../lib python ./$(INPUT) -o metadata | awk $(AWK) > $(TEMPFILE)
+ PYTHONPATH=$(abs_srcdir)/../lib:$(abs_builddir)/../lib python ./$(INPUT) -o metadata | $(AWK) $(AWK_VAL) > $(TEMPFILE)
diff $(TEMPFILE) $(DATADIR)/$(INPUT).xml
rm $(TEMPFILE)
xml-upload.%: %
$(eval INPUT=$(subst xml-upload.,,$@))
- PYTHONPATH=$(abs_srcdir)/../lib:$(abs_builddir)/../lib python ./$(INPUT) -o metadata | awk $(AWK) > $(DATADIR)/$(INPUT).xml
+ PYTHONPATH=$(abs_srcdir)/../lib:$(abs_builddir)/../lib python ./$(INPUT) -o metadata | $(AWK) $(AWK_VAL) > $(DATADIR)/$(INPUT).xml
# If test will fail, rerun fence agents to show problems
delay-check.%: %

View File

@ -1 +1 @@
5a5f3ddc0f054764e964068e74abfecc fence-agents-4.0.14.tar.xz
3693046b8b0a4c1dc88f60b120139ff0 fence-agents-4.0.15.tar.xz