packages: libguestfs/augeas-libxml2.patch, libguestfs/libguestfs.spec - rel...

[baggins]

Author: baggins                      Date: Fri Mar 16 19:26:24 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4
- should build now

---- Files affected:
packages/libguestfs:
   augeas-libxml2.patch (1.2 -> 1.3) , libguestfs.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: packages/libguestfs/augeas-libxml2.patch
diff -u packages/libguestfs/augeas-libxml2.patch:1.2 packages/libguestfs/augeas-libxml2.patch:1.3
--- packages/libguestfs/augeas-libxml2.patch:1.2	Fri Mar 16 19:04:22 2012
+++ packages/libguestfs/augeas-libxml2.patch	Fri Mar 16 20:26:19 2012
@@ -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],[

================================================================
Index: packages/libguestfs/libguestfs.spec
diff -u packages/libguestfs/libguestfs.spec:1.10 packages/libguestfs/libguestfs.spec:1.11
--- packages/libguestfs/libguestfs.spec:1.10	Fri Mar 16 19:21:20 2012
+++ packages/libguestfs/libguestfs.spec	Fri Mar 16 20:26:19 2012
@@ -11,7 +11,7 @@
 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
@@ -188,6 +188,7 @@
 	QEMU=%{_bindir}/qemu \
 	--with-java-home=%{java_home} \
 	--with-qemu=qemu \
+	--enable-install-daemon \
 	--disable-haskell \
 	--disable-ruby \
 	--disable-appliance \
@@ -385,6 +386,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2012/03/16 19:26:19  baggins
+- rel 4
+- should build now
+
 Revision 1.10  2012/03/16 18:21:20  baggins
 - more ac regen
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libguestfs/augeas-libxml2.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libguestfs/libguestfs.spec?r1=1.10&r2=1.11&f=u