Accepting request 99402 from network:ha-clustering:Factory

Only include glib.h in plugin.h (don't directly use glib/ghash.h)

OBS-URL: https://build.opensuse.org/request/show/99402
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pacemaker?expand=0&rev=44

fix-glib_h-include.patch

@@ -0,0 +1,13 @@
+Index: pacemaker/lib/ais/plugin.c
+===================================================================
+--- pacemaker.orig/lib/ais/plugin.c
++++ pacemaker/lib/ais/plugin.c
+@@ -40,7 +40,7 @@
+ #include "plugin.h"
+ #include "utils.h"
+ 
+-#include <glib/ghash.h>
++#include <glib.h>
+ 
+ #include <sys/resource.h>
+ #include <sys/utsname.h>

pacemaker.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan  9 08:26:22 UTC 2012 - tserong@suse.com
+
+- Only include glib.h in plugin.h (don't directly use glib/ghash.h)
+
 -------------------------------------------------------------------
 Fri Dec 16 04:42:38 UTC 2011 - tserong@suse.com
 

pacemaker.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package pacemaker
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
 %global pcmk_docdir %{_docdir}/%{name}
 %if 0%{?suse_version}
 %define _libexecdir %{_libdir}
@@ -51,6 +50,7 @@ Patch3:         pacemaker-rsc_ticket-schema.diff
 Patch4:         pacemaker-template-schema.diff
 Patch5:         bug-728579_pacemaker-stonith-dev-id.diff
 Patch6:         pacemaker-NodeUtilization-RA.diff
+Patch7:         fix-glib_h-include.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Conflicts:      heartbeat < 3.0
 # We need libglue2, not libheartbeat2
@@ -185,6 +185,7 @@ Authors:
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 ###########################################################
 
 %build