packages: resource-agents/resource-agents.spec, resource-agents/resource-ag...

[jajcus]

Author: jajcus                       Date: Wed Jul  4 16:36:02 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 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

---- Files affected:
packages/resource-agents:
   resource-agents.spec (1.15 -> 1.16) , resource-agents-no_header_parsing.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/resource-agents/resource-agents.spec
diff -u packages/resource-agents/resource-agents.spec:1.15 packages/resource-agents/resource-agents.spec:1.16
--- packages/resource-agents/resource-agents.spec:1.15	Fri Jun 29 12:01:56 2012
+++ packages/resource-agents/resource-agents.spec	Wed Jul  4 18:35:57 2012
@@ -3,7 +3,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/
@@ -11,6 +11,7 @@
 # Source0-md5:	3b5790e8041f2a459d8a0ff310682bfe
 Source1:	ldirectord.init
 Source2:	%{name}.tmpfiles
+Patch0:		%{name}-no_header_parsing.patch
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	cluster-glue-libs-devel
@@ -57,6 +58,7 @@
 
 %prep
 %setup -q -n ClusterLabs-%{name}-%{gitrel}
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -73,6 +75,7 @@
 	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}
@@ -81,6 +84,7 @@
 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
 
@@ -128,6 +132,8 @@
 %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
@@ -155,7 +161,6 @@
 %{_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
@@ -171,6 +176,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2012/07/04 16:35:57  jajcus
+- 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
+
 Revision 1.15  2012/06/29 10:01:56  kiesiu
 - added systemd tmpfiles config
 

================================================================
Index: packages/resource-agents/resource-agents-no_header_parsing.patch
diff -u /dev/null packages/resource-agents/resource-agents-no_header_parsing.patch:1.1
--- /dev/null	Wed Jul  4 18:36:02 2012
+++ packages/resource-agents/resource-agents-no_header_parsing.patch	Wed Jul  4 18:35:57 2012
@@ -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)
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/resource-agents/resource-agents.spec?r1=1.15&r2=1.16