[packages/resource-agents] - provide the heartbeat legacy /etc/ha.d directory, so other cluster stacks and resource agents wo

[draenog]

commit bdbf82117a55d0fc68cd61a8cc7c2d7897326f62
Author: Jacek Konieczny <jajcus at pld-linux.org>
Date:   Wed Jul 4 16:35:57 2012 +0000

    - provide the heartbeat legacy /etc/ha.d directory, so other cluster
      stacks and resource agents won't pull heartbeat by directory dependencies
    - provide the OCF_ROOT_DIR and do not let the configure script try
      to parse header files - it does not always work
    - Release: 2
    
    Changed files:
        resource-agents-no_header_parsing.patch -> 1.1
        resource-agents.spec -> 1.16

 resource-agents-no_header_parsing.patch | 15 +++++++++++++++
 resource-agents.spec                    |  9 +++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
---
diff --git a/resource-agents-no_header_parsing.patch b/resource-agents-no_header_parsing.patch
new file mode 100644
index 0000000..71c109d
--- /dev/null
+++ b/resource-agents-no_header_parsing.patch
@@ -0,0 +1,15 @@
+--- ClusterLabs-resource-agents-b735277/configure.ac~	2011-06-29 14:51:48.000000000 +0200
++++ ClusterLabs-resource-agents-b735277/configure.ac	2012-07-04 18:29:56.185645216 +0200
+@@ -366,12 +366,6 @@
+ 
+ AC_CHECK_HEADERS(heartbeat/glue_config.h)
+ 
+-if test "$ac_cv_header_heartbeat_glue_config_h" = "yes"; then
+-  OCF_ROOT_DIR=`extract_header_define heartbeat/glue_config.h OCF_ROOT_DIR`
+-else
+-  enable_libnet=no
+-fi
+-
+ AC_DEFINE_UNQUOTED(OCF_ROOT_DIR,"$OCF_ROOT_DIR", OCF root directory - specified by the OCF standard)
+ AC_SUBST(OCF_ROOT_DIR)
+ 
diff --git a/resource-agents.spec b/resource-agents.spec
index 0596962..49b1dbd 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -2,7 +2,7 @@
 Summary:	Reusable cluster resource scripts
 Name:		resource-agents
 Version:	3.9.2
-Release:	1
+Release:	2
 License:	GPL v2+; LGPL v2.1+
 Group:		Daemons
 URL:		http://www.linux-ha.org/
@@ -10,6 +10,7 @@ Source0:	https://github.com/ClusterLabs/resource-agents/tarball/v3.9.2
 # Source0-md5:	3b5790e8041f2a459d8a0ff310682bfe
 Source1:	ldirectord.init
 Source2:	%{name}.tmpfiles
+Patch0:		%{name}-no_header_parsing.patch
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	cluster-glue-libs-devel
@@ -56,6 +57,7 @@ See 'ldirectord -h' and linux-ha/doc/ldirectord for more information.
 
 %prep
 %setup -q -n ClusterLabs-%{name}-%{gitrel}
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -72,6 +74,7 @@ See 'ldirectord -h' and linux-ha/doc/ldirectord for more information.
 	PING=/bin/ping \
 	--with-initdir=/etc/rc.d/init.d \
 	--enable-fatal-warnings=yes \
+	--with-ocf-root=%{_prefix}/lib/ocf \
 	--docdir=%{_docdir}/%{name}-%{version}
 
 %{__make}
@@ -80,6 +83,7 @@ See 'ldirectord -h' and linux-ha/doc/ldirectord for more information.
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/ha.d/resource.d \
 	$RPM_BUILD_ROOT%{systemdtmpfilesdir}
+
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
@@ -127,6 +131,8 @@ fi
 %attr(755,root,root) %{_sbindir}/sfex_init
 %attr(755,root,root) %{_sbindir}/sfex_stat
 %attr(755,root,root) %{_sbindir}/rhev-check.sh
+%dir %{_sysconfdir}/ha.d
+%dir %{_sysconfdir}/ha.d/resource.d
 %{_sysconfdir}/ha.d/shellfuncs
 %{_includedir}/heartbeat/agent_config.h
 %attr(1755,root,root) /var/run/resource-agents
@@ -154,7 +160,6 @@ fi
 %{_mandir}/man8/sfex_init.8*
 %{systemdtmpfilesdir}/%{name}.conf
 
-
 %files -n ldirectord
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ha.d/ldirectord.cf