packages: libguestfs/libguestfs.spec, libguestfs/augeas-libxml2.patch (NEW)...

[baggins]

Author: baggins                      Date: Fri Mar 16 17:50:53 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3
- fix augeas and libxml2 deps
- don't force qemu binary

---- Files affected:
packages/libguestfs:
   libguestfs.spec (1.6 -> 1.7) , augeas-libxml2.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libguestfs/libguestfs.spec
diff -u packages/libguestfs/libguestfs.spec:1.6 packages/libguestfs/libguestfs.spec:1.7
--- packages/libguestfs/libguestfs.spec:1.6	Fri Mar 16 17:56:14 2012
+++ packages/libguestfs/libguestfs.spec	Fri Mar 16 18:50:48 2012
@@ -11,12 +11,13 @@
 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
@@ -167,18 +168,17 @@
 %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 \
@@ -376,6 +376,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2012/03/16 17:50:48  baggins
+- rel 3
+- fix augeas and libxml2 deps
+- don't force qemu binary
+
 Revision 1.6  2012/03/16 16:56:14  baggins
 - rel 2
 - R qemu-common, to avoid forcing installation of all qemu system targets

================================================================
Index: packages/libguestfs/augeas-libxml2.patch
diff -u /dev/null packages/libguestfs/augeas-libxml2.patch:1.1
--- /dev/null	Fri Mar 16 18:50:54 2012
+++ packages/libguestfs/augeas-libxml2.patch	Fri Mar 16 18:50:48 2012
@@ -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)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libguestfs/libguestfs.spec?r1=1.6&r2=1.7&f=u