Hello community, here is the log from the commit of package pacemaker for openSUSE:Factory checked in at 2012-01-09 16:23:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pacemaker (Old) and /work/SRC/openSUSE:Factory/.pacemaker.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pacemaker", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/pacemaker/pacemaker.changes 2011-12-25 17:37:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pacemaker.new/pacemaker.changes 2012-01-09 16:23:14.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Jan 9 08:26:22 UTC 2012 - [email protected] + +- Only include glib.h in plugin.h (don't directly use glib/ghash.h) + +------------------------------------------------------------------- New: ---- fix-glib_h-include.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pacemaker.spec ++++++ --- /var/tmp/diff_new_pack.wM4nzY/_old 2012-01-09 16:23:18.000000000 +0100 +++ /var/tmp/diff_new_pack.wM4nzY/_new 2012-01-09 16:23:18.000000000 +0100 @@ -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 @@ 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 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 ########################################################### %build ++++++ fix-glib_h-include.patch ++++++ 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> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
