From 475fb908ba61ab861255c8ae7df8d05212c2ce1b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Fri, 16 Mar 2012 17:50:48 +0000
Subject: [PATCH] - rel 3 - fix augeas and libxml2 deps - don't force qemu
 binary

Changed files:
    augeas-libxml2.patch -> 1.1
    libguestfs.spec -> 1.7
---
 augeas-libxml2.patch | 16 ++++++++++++++++
 libguestfs.spec      | 16 ++++++++--------
 2 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 augeas-libxml2.patch

diff --git a/augeas-libxml2.patch b/augeas-libxml2.patch
new file mode 100644
index 0000000..961a3dc
--- /dev/null
+++ b/augeas-libxml2.patch
@@ -0,0 +1,16 @@
+--- libguestfs-1.12.11/daemon/Makefile.am~	2011-12-22 20:05:03.000000000 +0100
++++ libguestfs-1.12.11/daemon/Makefile.am	2012-03-16 18:49:15.259588154 +0100
+@@ -173,6 +173,7 @@
+ 	liberrnostring.a \
+ 	libprotocol.a \
+ 	$(AUGEAS_LIBS) \
++	$(LIBXML2_LIBS) \
+ 	lib/libgnu.a \
+ 	$(GETADDRINFO_LIB) \
+ 	$(HOSTENT_LIB) \
+@@ -183,4 +184,4 @@
+ 	$(SERVENT_LIB)
+ 
+ AM_CPPFLAGS = -I$(srcdir)/lib -Ilib
+-guestfsd_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) $(AUGEAS_CFLAGS)
++guestfsd_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) $(AUGEAS_CFLAGS) $(LIBXML2_CFLAGS)
diff --git a/libguestfs.spec b/libguestfs.spec
index 31aa075..07198d7 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -10,12 +10,13 @@ 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:	2
+Release:	3
 License:	LGPL v2+
 Group:		Libraries
 Source0:	http://libguestfs.org/download/1.12-stable/%{name}-%{version}.tar.gz
 # Source0-md5:	e8aeab7dcedda08d73828e7387cd6cc0
 Patch0:		ncurses.patch
+Patch1:		augeas-libxml2.patch
 URL:		http://libguestfs.org/
 BuildRequires:	attr-devel
 BuildRequires:	augeas-devel
@@ -166,18 +167,17 @@ bash-completion for guestfish tool.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
-#%{__libtoolize}
-#%{__aclocal}
-#%{__autoconf}
-#%{__autoheader}
-#%{__automake}
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
 	vmchannel_test=no \
-	QEMU=%{_bindir}/qemu \
 	--with-java-home=%{java_home} \
-	--with-qemu=qemu \
 	--disable-haskell \
 	--disable-ruby \
 	--disable-appliance \
-- 
2.43.0