- Update to 4.0.15:

* Tripp Lite PDUs are now supported by fence_tripplite_snmp (symlink to 
    fence_apc_snmp)
  * Default values in metadata sometimes differ to those actually used, 
    this is fixed now
  * improvements in testing

OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/fence-agents?expand=0&rev=31
This commit is contained in:
Kristoffer Gronlund 2015-02-09 15:25:48 +00:00 committed by Git OBS Bridge
parent ab598a2265
commit 7252d672e5
5 changed files with 15 additions and 46 deletions

View File

@ -1,38 +0,0 @@
From 40ac206ebec011623ea6234229922d39d9eed4b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <krig@koru.se>
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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f912b63d9136aacfd6be9bd7edc617bd04d5a4afac9fb796f3b14878ab241401
size 597848

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3519343b12532076915aee926a8173d5a016b19206f3b4b4292eebcd93a11ecb
size 598424

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Feb 9 15:23:23 UTC 2015 - kgronlund@suse.com
- Update to 4.0.15:
* Tripp Lite PDUs are now supported by fence_tripplite_snmp (symlink to
fence_apc_snmp)
* Default values in metadata sometimes differ to those actually used,
this is fixed now
* improvements in testing
-------------------------------------------------------------------
Wed Jan 7 14:56:59 UTC 2015 - kgronlund@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package fence-agents
#
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -22,12 +22,10 @@ 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.14
Version: 4.0.15
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
@ -157,7 +155,6 @@ Authors:
%prep
%setup -q -n %{name}-%{version}
%patch1 -p1
%build
CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}"