Hello community,

here is the log from the commit of package hawk for openSUSE:Factory
checked in at Mon Aug 29 10:49:27 CEST 2011.



--------
--- hawk/hawk.changes   2011-07-13 16:33:18.000000000 +0200
+++ /mounts/work_src_done/STABLE/hawk/hawk.changes      2011-08-29 
06:50:57.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Aug 29 04:46:23 UTC 2011 - tser...@suse.com
+
+- Build: Fix glib & libxml order for hawk_monitor build
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  build-fix-libxml-link.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ hawk.spec ++++++
--- /var/tmp/diff_new_pack.iTgWeY/_old  2011-08-29 10:49:01.000000000 +0200
+++ /var/tmp/diff_new_pack.iTgWeY/_new  2011-08-29 10:49:01.000000000 +0200
@@ -27,7 +27,7 @@
 Name:           hawk
 Summary:        HA Web Konsole
 Version:        0.4.1
-Release:        2
+Release:        4
 License:        GPLv2
 Url:            http://www.clusterlabs.org/wiki/Hawk
 Group:          Productivity/Clustering/HA
@@ -42,6 +42,7 @@
 Patch102:       build-fix-hawk_invoke-implicit-decls.patch
 Patch103:       build-fix-pie.patch
 Patch104:       build-fix-cib_test.patch
+Patch105:       build-fix-libxml-link.patch
 %define                _use_internal_dependency_generator 0
 %define                __find_requires /bin/sh %{SOURCE1}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -85,6 +86,7 @@
 %patch102 -p0
 %patch103 -p0
 %patch104 -p0
+%patch105 -p0
 
 %build
 CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}"

++++++ build-fix-libxml-link.patch ++++++
Index: Makefile
===================================================================
--- Makefile.orig
+++ Makefile
@@ -77,11 +77,13 @@ tools/hawk_chkpwd: tools/hawk_chkpwd.c t
 
 tools/hawk_monitor: tools/hawk_monitor.c
        gcc $(CFLAGS) \
-               $(shell pkg-config --cflags glib-2.0) $(shell pkg-config --libs 
glib-2.0) \
-               $(shell pkg-config --cflags libxml-2.0) $(shell pkg-config 
--libs libxml-2.0) \
+               $(shell pkg-config --cflags glib-2.0) \
+               $(shell pkg-config --cflags libxml-2.0) \
                -I/usr/include/pacemaker -I/usr/include/heartbeat \
                -o $@ $< \
-               -lcib -lcrmcommon -Wall
+               -lcib -lcrmcommon -Wall \
+               $(shell pkg-config --libs glib-2.0) \
+               $(shell pkg-config --libs libxml-2.0)
 
 # TODO(must): This is inching towards becoming annoying: want better build 
infrastructure/deps
 tools/hawk_invoke: tools/hawk_invoke.c tools/common.h

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to