commit efe332c81c90a86be938298a60b72985e8e77ec7
Author: Jakub Bogusz <[email protected]>
Date: Fri Nov 1 09:44:31 2013 +0100
- updated to 4.0.5
- added check patch (workaround for failing options check)
fence-agents-check.patch | 28 ++++++++++++++++++++++++++++
fence-agents.spec | 7 +++++--
2 files changed, 33 insertions(+), 2 deletions(-)
---
diff --git a/fence-agents.spec b/fence-agents.spec
index 15d6c84..748a596 100644
--- a/fence-agents.spec
+++ b/fence-agents.spec
@@ -5,12 +5,13 @@
Summary: Reusable cluster fencing scripts
Summary(pl.UTF-8): Skrypty barier klastrowych wielokrotnego użytku
Name: fence-agents
-Version: 4.0.3
+Version: 4.0.5
Release: 1
License: GPL v2+ (libraries), LGPL v2.1+ (applications)
Group: Daemons
Source0:
https://fedorahosted.org/releases/f/e/fence-agents/%{name}-%{version}.tar.xz
-# Source0-md5: e05b467428f6aed97eb30a8435d3b45a
+# Source0-md5: 7ad2164384a5d1d005695fc216ee6bac
+Patch0: %{name}-check.patch
URL: https://fedorahosted.org/cluster/wiki/HomePage
BuildRequires: autoconf >= 2.63
BuildRequires: automake
@@ -37,6 +38,7 @@ Skrypty zapewniające funkcjonalność barier dla węzłów klastra.
%prep
%setup -q
+%patch0 -p1
%build
%{__libtoolize}
@@ -73,4 +75,5 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/cluster/relaxng/fence.rng.tail
%{_datadir}/cluster/relaxng/fence2man.xsl
%{_datadir}/cluster/relaxng/fence2rng.xsl
+%{_datadir}/cluster/relaxng/metadata.rng
%{_mandir}/man8/fence_*.8*
diff --git a/fence-agents-check.patch b/fence-agents-check.patch
new file mode 100644
index 0000000..07e9d64
--- /dev/null
+++ b/fence-agents-check.patch
@@ -0,0 +1,28 @@
+--- fence-agents-4.0.5/fence/agents/lib/check_used_options.py.orig
2013-10-22 17:06:49.000000000 +0200
++++ fence-agents-4.0.5/fence/agents/lib/check_used_options.py 2013-11-01
09:35:22.583722951 +0100
+@@ -22,6 +22,10 @@
+
+ ## add UUID which is derived automatically from --plug if possible
+ available["--uuid"] = True
++ # --plugs is constructed from --plug
++ available["--plugs"] = True
++ # probably should be defined
++ available["--managed"] = True
+
+ ## all_opt defined in fence agent are found
+ agent_file = open(agent)
+@@ -48,12 +52,12 @@
+
+ for x in option_use_re.findall(line):
+ if not available.has_key(x):
+- print "ERROR on line %d in %s: option %s is not
defined" % (counter, agent, option_use_re.search(line).group(1))
++ print "ERROR on line %d in %s: option %s is not
defined" % (counter, agent, x)
+ without_errors = False
+
+ for x in option_has_re.findall(line):
+ if not available.has_key(x):
+- print "ERROR on line %d in %s: option %s is not
defined" % (counter, agent, option_has_re.search(line).group(1))
++ print "ERROR on line %d in %s: option %s is not
defined" % (counter, agent, x)
+ without_errors = False
+
+ if without_errors:
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/fence-agents.git/commitdiff/efe332c81c90a86be938298a60b72985e8e77ec7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
