From 8a4aae5d1ad6aeaf5ec5b8412eedfba934f93888 Mon Sep 17 00:00:00 2001
From: David Vossel <dvossel@redhat.com>
Date: Wed, 30 Oct 2013 15:50:51 -0500
Subject: [PATCH] Fix buildsystem for rawhide

---
 fix_build_system.patch | 26 ++++++++++++++++++++++++++
 resource-agents.spec   |  7 ++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 fix_build_system.patch

diff --git a/fix_build_system.patch b/fix_build_system.patch
new file mode 100644
index 0000000..31d0f35
--- /dev/null
+++ b/fix_build_system.patch
@@ -0,0 +1,26 @@
+diff --git a/ldirectord/Makefile.am b/ldirectord/Makefile.am
+index 38c11e2..71461f9 100644
+--- a/ldirectord/Makefile.am
++++ b/ldirectord/Makefile.am
+@@ -37,7 +37,7 @@ harddir			= $(sysconfdir)/ha.d/resource.d
+ 
+ .PHONY: install-exec-hook
+ install-exec-hook:
+-	$(mkinstalldirs) $(DESTDIR)$(harddir)
++	$(INSTALL) -d $(DESTDIR)$(harddir)
+ 	cd $(DESTDIR)$(harddir) && ln -s -f $(sbindir)/ldirectord .
+ 
+ .PHONY: uninstall-hook
+diff --git a/ldirectord/init.d/Makefile.am b/ldirectord/init.d/Makefile.am
+index 4effe96..e23265c 100644
+--- a/ldirectord/init.d/Makefile.am
++++ b/ldirectord/init.d/Makefile.am
+@@ -25,7 +25,7 @@ initd_SCRIPTS	        = ldirectord
+ 
+ install-initdSCRIPTS: $(initd_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(initddir)
++	$(INSTALL) -d $(DESTDIR)$(initddir)
+ 	@list='$(initd_SCRIPTS)'; for p in $$list; do \
+ 	  f="`echo $$p|sed '$(transform)'`"; \
+ 	  if test -f $$p; then \
diff --git a/resource-agents.spec b/resource-agents.spec
index 10d8b45..50d25bb 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -36,7 +36,7 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	3.9.5
-Release:	9%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release:	10%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
 License:	GPLv2+ and LGPLv2+
 URL:		https://github.com/ClusterLabs/resource-agents
 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
@@ -45,6 +45,7 @@ Group:		System Environment/Base
 Group:		Productivity/Clustering/HA
 %endif
 Source0:	%{upstream_prefix}-%{upstream_version}.tar.gz
+Patch0:		fix_build_system.patch
 Obsoletes:	heartbeat-resources <= %{version}
 Provides:	heartbeat-resources = %{version}
 
@@ -148,6 +149,7 @@ See 'ldirectord -h' and linux-ha/doc/ldirectord for more information.
 exit 1
 %endif
 %setup -q -n %{upstream_prefix}-%{upstream_version}
+%patch0 -p1
 
 %build
 if [ ! -f configure ]; then
@@ -300,6 +302,9 @@ ccs_update_schema > /dev/null 2>&1 ||:
 %endif
 
 %changelog
+* Wed Oct 20 2013 David Vossel <dvossel@redhat.com> - 3.9.5-10
+- Fix build system for rawhide.
+
 * Wed Oct 16 2013 David Vossel <dvossel@redhat.com> - 3.9.5-9
 - Remove rgmanager agents from build.