[cluster-glue] Fix compilation due to braindamaged glib policy

[Andrew Beekhof]

commit 83f0f08d9f9b39d4c4e92fed44fe8b9a3e7d49d5
Author: Andrew Beekhof <andrew at beekhof.net>
Date:   Mon Dec 12 16:02:32 2011 +1100

    Fix compilation due to braindamaged glib policy

 cluster-glue.spec             |    7 ++++++-
 glib-everything-or-bust.patch |   17 +++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/cluster-glue.spec b/cluster-glue.spec
index 6434ddd..57b32fe 100644
--- a/cluster-glue.spec
+++ b/cluster-glue.spec
@@ -4,7 +4,7 @@
 
 # When downloading directly from Mercurial, it will automatically add this prefix
 # Invoking 'hg archive' wont but you can add one with: hg archive -t tgz -p "Reusable-Cluster-Components-" -r $upstreamversion $upstreamversion.tar.gz
-%global specversion 8
+%global specversion 9
 %global upstreamprefix Reusable-Cluster-Components-
 %global upstreamversion 8286b46c91e3
 
@@ -20,6 +20,7 @@ Url:		http://linux-ha.org/wiki/Cluster_Glue
 Group:		System Environment/Base
 Source0:	http://hg.linux-ha.org/glue/archive/%{upstreamversion}.tar.bz2
 Source1:	logd.service
+Patch1:		glib-everything-or-bust.patch
 Requires:	%{name}-libs = %{version}-%{release}
 
 # Directives to allow upgrade from combined heartbeat packages in Fedora11
@@ -59,6 +60,7 @@ BuildRequires: e2fsprogs-devel
 
 %prep
 %setup -q -n %{upstreamprefix}%{upstreamversion}
+%patch1 -p0
 
 ./autogen.sh
 
@@ -240,6 +242,9 @@ such as Pacemaker.
 %doc COPYING.LIB
 
 %changelog
+* Mon Dec 12 2011 Andrew Beekhof <andrew at beekhof.net> - 1.0.6-9
+- Fix compilation now that it is compulsory to include the whole of glib
+
 * Mon Sep 26 2011 Andrew Beekhof <andrew at beekhof.net> - 1.0.6-8
 - Allow cluster-glue-libs to be installed independently of cluster-glue
 
diff --git a/glib-everything-or-bust.patch b/glib-everything-or-bust.patch
new file mode 100644
index 0000000..e15377d
--- /dev/null
+++ b/glib-everything-or-bust.patch
@@ -0,0 +1,17 @@
+---
+ include/clplumbing/cl_uuid.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: include/clplumbing/cl_uuid.h
+===================================================================
+--- include/clplumbing/cl_uuid.h.orig	2010-07-15 22:54:56.000000000 +1000
++++ include/clplumbing/cl_uuid.h	2011-12-12 15:52:09.498251710 +1100
+@@ -16,7 +16,7 @@
+ 
+ #ifndef _CL_UUID_H_
+ #define _CL_UUID_H_
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ typedef struct cl_uuid_s{	
+ 	unsigned char	uuid[16];