- updated to 4.0.21

- updated check patch

diff --git a/fence-agents-check.patch b/fence-agents-check.patch
index af35181f8c254d503dc4dfd18cb9d51636dc8012..9f481f528915cf3b95cda0e5be446260ef088f06 100644 (file)
--- a/fence-agents-check.patch
+++ b/fence-agents-check.patch
@@ -1,6 +1,6 @@
 --- fence-agents-4.0.10/fence/agents/lib/check_used_options.py.orig    2014-07-01 12:53:45.000000000 +0200
 +++ fence-agents-4.0.10/fence/agents/lib/check_used_options.py 2014-07-05 08:41:55.273724364 +0200
-@@ -22,6 +22,10 @@
+@@ -22,6 +22,12 @@
  
        ## add UUID which is derived automatically from --plug if possible
        available["--uuid"] = True
@@ -8,21 +8,23 @@
 +      available["--plugs"] = True
 +      # probably should be defined
 +      available["--managed"] = True
++      # used temporarily in lib/fencing.py
++      available["--original-action"] = True
  
        ## all_opt defined in fence agent are found
        agent_file = open(agent)
-@@ -48,12 +52,12 @@
+@@ -48,12 +54,12 @@
  
                for option in option_use_re.findall(line):
                        if not available.has_key(option):
 -                              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)
++                              print "ERROR on line %d in %s: option %s is not defined" % (counter, agent, option)
                                without_errors = False
  
                for option in option_has_re.findall(line):
                        if not available.has_key(option):
 -                              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)
++                              print "ERROR on line %d in %s: option %s is not defined" % (counter, agent, option)
                                without_errors = False
  
        if without_errors:

diff --git a/fence-agents.spec b/fence-agents.spec
index c31ab3de6289b267087d069aba4f8b033f439336..31caf2d27ec50b08aaa79a568c8da56c5041ac9c 100644 (file)
--- a/fence-agents.spec
+++ b/fence-agents.spec
@@ -5,12 +5,12 @@
 Summary:       Reusable cluster fencing scripts
 Summary(pl.UTF-8):     Skrypty barier klastrowych wielokrotnego użytku
 Name:          fence-agents
-Version:       4.0.11
+Version:       4.0.21
 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: 8d3d72670e836782ef97ada368484ef1
+# Source0-md5: ed5376de5956fd507624ce752e06c0bd
 Patch0:                %{name}-check.patch
 URL:           https://fedorahosted.org/cluster/wiki/HomePage
 BuildRequires: autoconf >= 2.63
@@ -20,6 +20,7 @@ BuildRequires:        perl-Net-Telnet
 BuildRequires: pkgconfig
 BuildRequires: python-pexpect
 BuildRequires: python-pycurl
+BuildRequires: python-requests
 BuildRequires: python-suds
 BuildRequires: rpm-perlprov
 BuildRequires: tar >= 1:1.22
@@ -30,8 +31,22 @@ Requires:    gnutls
 Requires:      resource-agents >= 3.9
 # /usr/bin/amttool
 Suggests:      amtterm
+# /usr/sbin/corosync-cmapctl tool
+Suggests:      corosync
 # /usr/bin/ipmitool
 Suggests:      ipmitool
+# /sbin/vgs
+Suggests:      lvm2
+# /sbin/mpathpersist
+Suggests:      multipath-tools
+# /usr/bin/snmpget, /usr/bin/snmpset, /usr/bin/snmpwalk
+Suggests:      net-snmp-tools
+Suggests:      openssh-clients
+# /usr/bin/sg_persist, /usr/bin/sg_turs
+Suggests:      sg3_utils
+Suggests:      sudo
+Suggests:      telnet
+# /usr/bin/nova - seems not used
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -46,7 +61,7 @@ Skrypty zapewniające funkcjonalność barier dla węzłów klastra.
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I make
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -78,5 +93,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/cluster/relaxng/fence.rng.tail
 %{_datadir}/cluster/relaxng/fence2man.xsl
 %{_datadir}/cluster/relaxng/fence2rng.xsl
+%{_datadir}/cluster/relaxng/fence2wiki.xsl
 %{_datadir}/cluster/relaxng/metadata.rng
 %{_mandir}/man8/fence_*.8*