From e85d211cd679305911d2919fb3e76ed785093b92 Mon Sep 17 00:00:00 2001
From: Chris Feist <cfeist@redhat.com>
Date: Oct 29 2012 22:59:24 +0000
Subject: Updated to disable IPv6addr & sfex due to removed cluster-glue


---

diff --git a/no-cluster-glue.patch b/no-cluster-glue.patch
new file mode 100644
index 0000000..36807f5
--- /dev/null
+++ b/no-cluster-glue.patch
@@ -0,0 +1,44 @@
+--- resource-agents-3.9.2/doc/Makefile.in.no-glue	2012-10-29 17:56:50.754473189 -0500
++++ resource-agents-3.9.2/doc/Makefile.in	2012-10-29 17:57:05.233313075 -0500
+@@ -54,7 +54,7 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-@BUILD_DOC_TRUE@@USE_IPV6ADDR_TRUE@am__append_1 = ocf_heartbeat_IPv6addr.7
++#@BUILD_DOC_TRUE@@USE_IPV6ADDR_TRUE@am__append_1 = ocf_heartbeat_IPv6addr.7
+ subdir = doc
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -579,8 +579,8 @@ XSLTPROC_FO_OPTIONS 	?= $(XSLTPROC_OPTIO
+ metadata-%.xml: $(radir)/%
+ 	OCF_ROOT=. OCF_FUNCTIONS_DIR=$(radir) $< meta-data > $@
+ 
+-metadata-IPv6addr.xml: ../heartbeat/IPv6addr
+-	OCF_ROOT=. OCF_FUNCTIONS_DIR=$(radir) $< meta-data > $@
++#metadata-IPv6addr.xml: ../heartbeat/IPv6addr
++#	OCF_ROOT=. OCF_FUNCTIONS_DIR=$(radir) $< meta-data > $@
+ 
+ @BUILD_DOC_TRUE@%.1 %.5 %.7 %.8: %.xml
+ @BUILD_DOC_TRUE@	$(XSLTPROC) \
+--- resource-agents-3.9.2/heartbeat/Makefile.in.no-glue	2011-06-30 02:27:34.000000000 -0500
++++ resource-agents-3.9.2/heartbeat/Makefile.in	2012-10-29 17:55:59.133041412 -0500
+@@ -36,7 +36,7 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-@USE_IPV6ADDR_TRUE@ocf_PROGRAMS = IPv6addr$(EXEEXT)
++#@USE_IPV6ADDR_TRUE@ocf_PROGRAMS = IPv6addr$(EXEEXT)
+ subdir = heartbeat
+ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ 	$(srcdir)/ocf-binaries.in $(srcdir)/ocf-directories.in \
+--- resource-agents-3.9.2/heartbeat/Makefile.am.no-glue	2011-06-22 04:46:47.000000000 -0500
++++ resource-agents-3.9.2/heartbeat/Makefile.am	2012-10-29 17:55:59.133041412 -0500
+@@ -31,7 +31,7 @@ dtddir			= $(datadir)/$(PACKAGE_NAME)
+ dtd_DATA		= ra-api-1.dtd
+ 
+ if USE_IPV6ADDR
+-ocf_PROGRAMS           = IPv6addr
++ocf_PROGRAMS           =
+ else
+ ocf_PROGRAMS           =
+ endif
diff --git a/resource-agents.spec b/resource-agents.spec
index 3baf486..d4f7311 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -33,7 +33,7 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	3.9.2
-Release:	3%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.7
+Release:	3%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.8
 License:	GPLv2+ and LGPLv2+
 URL:		http://to.be.defined.com/
 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
@@ -42,6 +42,7 @@ Group:		System Environment/Base
 Group:		Productivity/Clustering/HA
 %endif
 Source0:	%{name}-%{version}%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}.tar.bz2
+Patch0:		no-cluster-glue.patch
 Obsoletes:	heartbeat-resources <= %{version}
 Provides:	heartbeat-resources = %{version}
 
@@ -142,6 +143,7 @@ See 'ldirectord -h' and linux-ha/doc/ldirectord for more information.
 exit 1
 %endif
 %setup -q -n %{name}-%{version}%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}
+%patch0 -p1 -b .no-glue
 
 %build
 if [ ! -f configure ]; then
@@ -238,8 +240,8 @@ rm -rf %{buildroot}
 
 %{_sbindir}/ocf-tester
 %{_sbindir}/ocft
-%{_sbindir}/sfex_init
-%{_sbindir}/sfex_stat
+#%{_sbindir}/sfex_init
+#%{_sbindir}/sfex_stat
 
 %{_includedir}/heartbeat
 
@@ -251,7 +253,7 @@ rm -rf %{buildroot}
 
 %{_mandir}/man7/*.7*
 %{_mandir}/man8/ocf-tester.8*
-%{_mandir}/man8/sfex_init.8*
+#%{_mandir}/man8/sfex_init.8*
 
 # For compatability with pre-existing agents
 %dir %{_sysconfdir}/ha.d
@@ -298,9 +300,10 @@ ccs_update_schema > /dev/null 2>&1 ||:
 %endif
 
 %changelog
-* Mon Oct 29 2012 Chris Feist <cfeist@redhat.com> - 3.9.2-3.7
+* Mon Oct 29 2012 Chris Feist <cfeist@redhat.com> - 3.9.2-3.8
 - Remove cluster-glue-libs-devel
-- Rebuilt to fix deps on libplumgpl & libplum
+- Disable IPv6addr & sfex to fix deps on libplumgpl & libplum (due to
+  disappearance of cluster-glue in F18)
 
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.9.2-3.5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild