- rel 3

- fix augeas and libxml2 deps
- don't force qemu binary

Changed files:
    augeas-libxml2.patch -> 1.1
    libguestfs.spec -> 1.7

diff --git a/augeas-libxml2.patch b/augeas-libxml2.patch
new file mode 100644 (file)
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 31aa075ff496c980cf69aab25a4f534e019ee82a..07198d7f139e60b227593f5a28ed6ab113d23098 100644 (file)
--- 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
 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
 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
 URL:           http://libguestfs.org/
 BuildRequires: attr-devel
 BuildRequires: augeas-devel


@@ -166,18 +167,17 @@ bash-completion for guestfish tool.
 %prep
 %setup -q
 %patch0 -p1
 %prep
 %setup -q
 %patch0 -p1

+%patch1 -p1

 
 %build
 
 %build

-#%{__libtoolize}
-#%{__aclocal}
-#%{__autoconf}
-#%{__autoheader}
-#%{__automake}
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}

 %configure \
        vmchannel_test=no \
 %configure \
        vmchannel_test=no \

-       QEMU=%{_bindir}/qemu \

        --with-java-home=%{java_home} \
        --with-java-home=%{java_home} \

-       --with-qemu=qemu \

        --disable-haskell \
        --disable-ruby \
        --disable-appliance \
        --disable-haskell \
        --disable-ruby \
        --disable-appliance \