From 96e43ae771e499acc25e99836d7729c4138068dc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Fri, 16 Mar 2012 19:26:19 +0000 Subject: [PATCH 1/1] - rel 4 - should build now Changed files: augeas-libxml2.patch -> 1.3 libguestfs.spec -> 1.11 --- augeas-libxml2.patch | 18 ++++++++++++++++++ libguestfs.spec | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/augeas-libxml2.patch b/augeas-libxml2.patch index 3e8dc07..ac09e81 100644 --- a/augeas-libxml2.patch +++ b/augeas-libxml2.patch @@ -16,3 +16,21 @@ -guestfsd_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) $(AUGEAS_CFLAGS) +AM_CPPFLAGS = -I$(srcdir)/lib -Ilib $(WARN_CFLAGS) $(WERROR_CFLAGS) $(AUGEAS_CFLAGS) $(LIBXML2_CFLAGS) +guestfsd_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) $(AUGEAS_CFLAGS) $(LIBXML2_CFLAGS) +--- libguestfs-1.12.11/daemon/configure.ac~ 2011-12-22 20:06:47.000000000 +0100 ++++ libguestfs-1.12.11/daemon/configure.ac 2012-03-16 20:17:43.343161378 +0100 +@@ -168,6 +168,15 @@ + ], + [AC_MSG_WARN([augeas not found, some core features will be disabled])]) + ++dnl libxml2 (highly recommended) ++PKG_CHECK_MODULES([LIBXML2], [libxml-2.0], ++ [AC_SUBST([LIBXML2_CFLAGS]) ++ AC_SUBST([LIBXML2_LIBS]) ++ AC_DEFINE([HAVE_LIBXML2],[1],[libxml2 found at compile time.]) ++ ], ++ [AC_MSG_WARN([libxml2 not found, some core features will be disabled])]) ++AM_CONDITIONAL([HAVE_LIBXML2],[test "x$LIBXML2_LIBS" != "x"]) ++ + dnl Check for libselinux (optional). + AC_CHECK_HEADERS([selinux/selinux.h]) + AC_CHECK_LIB([selinux],[setexeccon],[ diff --git a/libguestfs.spec b/libguestfs.spec index d552e15..6a549ec 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -10,7 +10,7 @@ Summary: Tools for accessing and modifying virtual machine disk images Summary(pl.UTF-8): Narzędzia do dostępu i modyfikacji obrazów dysków maszyn wirtualnych Name: libguestfs Version: 1.12.11 -Release: 3 +Release: 4 License: LGPL v2+ Group: Libraries Source0: http://libguestfs.org/download/1.12-stable/%{name}-%{version}.tar.gz @@ -187,6 +187,7 @@ cd .. QEMU=%{_bindir}/qemu \ --with-java-home=%{java_home} \ --with-qemu=qemu \ + --enable-install-daemon \ --disable-haskell \ --disable-ruby \ --disable-appliance \ -- 2.44.0