[resource-agents] Update to new upstream agents

[Fabio M. Di Nitto]

commit f70cb5965770095317b32bf5edc02bbea0151845
Author: Fabio M. Di Nitto <fdinitto at redhat.com>
Date:   Tue Mar 1 17:06:57 2011 +0100

    Update to new upstream agents
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>

 .gitignore           |    3 +++
 resource-agents.spec |   23 +++++++++++++++++++----
 sources              |    4 ++--
 3 files changed, 24 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b714ec4..88274f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,6 @@ resource-agents-3.0.14.tar.bz2
 /71b1377f907c.tar.bz2
 /resource-agents-3.0.17.tar.bz2
 /resource-agents-3.1.0.tar.xz
+/resource-agents-3.1.1.tar.xz
+/agents-1.0.4.tar.bz2
+/1.0.4.tar.bz2
diff --git a/resource-agents.spec b/resource-agents.spec
index ddc3288..231807f 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -17,12 +17,12 @@
 # Invoking 'hg archive' wont but you can add one with:
 #  hg archive -t tgz -p "Cluster-Resource-Agents-" -r $altversion $altversion.tar.gz
 %global altprefix Cluster-Resource-Agents-
-%global altversion 71b1377f907c
+%global altversion agents-1.0.4
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
-Version: 3.1.0
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.1.1
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sourceware.org/cluster/wiki/
@@ -121,13 +121,21 @@ make install DESTDIR=%{buildroot}
 make -C %{altprefix}%{altversion} install DESTDIR=%{buildroot}
 
 # tree fixup
-rm %{buildroot}/%{_libdir}/heartbeat/ocf-*
+#rm %{buildroot}/%{_libdir}/heartbeat/ocf-*
 find %{buildroot} -type f -name '.ocf-*' -exec chmod 644 {} \;
 find %{buildroot} -type f -name 'ocf-*' -exec chmod 644 {} \;
 find %{buildroot} -type f -name '*.dtd' -exec chmod 644 {} \;
 chmod 755 %{buildroot}/%{_sbindir}/ocf-tester
 chmod 755 %{buildroot}/%{_datadir}/cluster/ocf-shellfuncs
 
+(
+cd %{buildroot}/usr/lib/ocf/resource.d/heartbeat
+for f in ocf-binaries ocf-directories ocf-returncodes ocf-shellfuncs
+do
+	ln -s ../../lib/heartbeat/$f .$f
+done
+)
+
 # Strange location, remove until we can confirm
 rm -f %{buildroot}%{_libdir}/heartbeat/tickle_tcp
 
@@ -169,10 +177,14 @@ rm -rf %{buildroot}
 
 %dir /usr/lib/ocf
 %dir /usr/lib/ocf/resource.d
+%dir /usr/lib/ocf/lib
+%dir /usr/lib/ocf/lib/heartbeat
+/usr/lib/ocf/lib/heartbeat/ocf-*
 /usr/lib/ocf/resource.d/heartbeat
 /usr/lib/ocf/resource.d/redhat
 %{_sbindir}/ocf-tester
 %{_sbindir}/sfex_init
+%{_sbindir}/sfex_stat
 
 %dir %{_datadir}/resource-agents
 %doc %{_datadir}/resource-agents/ra-api-1.dtd
@@ -201,6 +213,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Tue Mar  1 2011 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.1.1-1
+- new upstream release 3.1.1 and 1.0.4
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index f57d837..63c139b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-a3d8f78617099e6e031fec25a1013444  71b1377f907c.tar.bz2
-4313c74cf1df00c2dbcb02a85bb56fb5  resource-agents-3.1.0.tar.xz
+d63cacb4291307775993b49093397098  agents-1.0.4.tar.bz2
+ae864cc42c851cdd34bf22607a99e36b  resource-agents-3.1.1.tar.xz