diff --git a/0001-Avoid-problem-with-broken-make-variable-expansion.patch b/0001-Avoid-problem-with-broken-make-variable-expansion.patch new file mode 100644 index 0000000..2079528 --- /dev/null +++ b/0001-Avoid-problem-with-broken-make-variable-expansion.patch @@ -0,0 +1,38 @@ +From 40ac206ebec011623ea6234229922d39d9eed4b7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= +Date: Mon, 15 Dec 2014 14:45:34 +0100 +Subject: [PATCH] Avoid problem with broken make variable expansion + +--- + make/agentpycheck.mk | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/make/agentpycheck.mk b/make/agentpycheck.mk +index 090116b..2209bdf 100644 +--- a/make/agentpycheck.mk ++++ b/make/agentpycheck.mk +@@ -1,19 +1,18 @@ + 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--}' + + 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 'BEGIN {store=-1} /name=\"store_path\"/ {store=2} {if (store!=0) {print}; store--}' > $(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 'BEGIN {store=-1} /name=\"store_path\"/ {store=2} {if (store!=0) {print}; store--}' > $(DATADIR)/$(INPUT).xml + + # If test will fail, rerun fence agents to show problems + delay-check.%: % +-- +2.2.0 + diff --git a/fence-agents-4.0.12.tar.xz b/fence-agents-4.0.12.tar.xz deleted file mode 100644 index 34576af..0000000 --- a/fence-agents-4.0.12.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2a1f0fdff9c5a727bdcd4a02f650ce941bd7007af37bf25407f3b66d7464e67b -size 606080 diff --git a/fence-agents-4.0.13.tar.xz b/fence-agents-4.0.13.tar.xz new file mode 100644 index 0000000..25e20fe --- /dev/null +++ b/fence-agents-4.0.13.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6e91cb08f29667c911db841868980e9bc33885ff44738fd0fd81c4f8ebd7708 +size 607952 diff --git a/fence-agents.changes b/fence-agents.changes index 54c595e..3ff1c71 100644 --- a/fence-agents.changes +++ b/fence-agents.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Mon Dec 15 12:04:13 UTC 2014 - kgronlund@suse.com + +- Update to 4.0.13: + * new fence agent based on mpathpersist that offers better handling of + multipath devices + * improve support of fence_ilo_ssh on older firmwares + + * required packages are also required by autoconf during build time + * fence_zvm now supports action 'monitor' (thanks to Neale Ferguson) + * introduce --gnutlscli-path --sudo-path --ssh-path and --telnet-path; + they are no longer hard-coded + * order of XML parameters or options in --help is more stable now + * fence_cisco_ucs did not set protocol prefix correctly with + --ssl-(in)secure + * logging to syslog now works correctly also with \x00 as input + +- Add patch: 0001-Avoid-problem-with-broken-make-variable-expansion.patch + ------------------------------------------------------------------- Thu Oct 16 13:42:38 UTC 2014 - kgronlund@suse.com diff --git a/fence-agents.spec b/fence-agents.spec index 3f173e3..ef7fe2a 100644 --- a/fence-agents.spec +++ b/fence-agents.spec @@ -22,10 +22,12 @@ Name: fence-agents Summary: Fence Agents for Pacemaker from RHCS License: GPL-2.0 and LGPL-2.1 Group: Productivity/Clustering/HA -Version: 4.0.12 +Version: 4.0.13 Release: 0 Url: http://git.fedorahosted.org/git/fence-agents.git Source0: %{name}-%{version}.tar.xz +# PATCH-FIX-OPENSUSE: Avoid problem with broken make variable expansion +Patch1: 0001-Avoid-problem-with-broken-make-variable-expansion.patch Requires: python-curl Requires: python-openssl @@ -155,6 +157,7 @@ Authors: %prep %setup -q -n %{name}-%{version} +%patch1 -p1 %build CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}" @@ -182,7 +185,7 @@ then rm -rf $RPM_BUILD_ROOT fi -%files +%files %defattr(-,root,root,-) %doc doc/COPYING.* doc/COPYRIGHT doc/README.licence #%%dir %%{_sysconfdir}/cluster