- Update to version 1.19.35

disable java
  remove kvm and qemu from BuildRequires, the path to qemu-kvm
  can be passed to configure

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=29

guestfs.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a6b7c12033e4aa004b5eac0cdf27e112404f1fde4ec36644f9cf5b5dcc5a83df
-size 40260936

libguestfs-1.19.34.patch

@@ -1,59 +0,0 @@
----
- examples/Makefile.am          |    2 +-
- fuse/Makefile.am              |    2 +-
- src/Makefile.am               |    2 +-
- tests/mount-local/Makefile.am |    2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-Index: libguestfs-1.19.34/examples/Makefile.am
-===================================================================
---- libguestfs-1.19.34.orig/examples/Makefile.am
-+++ libguestfs-1.19.34/examples/Makefile.am
-@@ -86,7 +86,7 @@ mount_local_CFLAGS = \
- 	$(FUSE_CFLAGS) \
- 	$(WARN_CFLAGS) $(WERROR_CFLAGS)
- mount_local_LDADD = \
--	$(FUSE_LIBS) -lulockmgr \
-+	$(FUSE_LIBS) \
- 	$(top_builddir)/src/libguestfs.la
- endif
- 
-Index: libguestfs-1.19.34/fuse/Makefile.am
-===================================================================
---- libguestfs-1.19.34.orig/fuse/Makefile.am
-+++ libguestfs-1.19.34/fuse/Makefile.am
-@@ -51,7 +51,7 @@ guestmount_CFLAGS = \
- 	$(WARN_CFLAGS) $(WERROR_CFLAGS)
- 
- guestmount_LDADD = \
--	$(FUSE_LIBS) -lulockmgr \
-+	$(FUSE_LIBS) \
- 	$(LIBCONFIG_LIBS) \
- 	$(top_builddir)/src/libguestfs.la \
- 	../gnulib/lib/libgnu.la
-Index: libguestfs-1.19.34/src/Makefile.am
-===================================================================
---- libguestfs-1.19.34.orig/src/Makefile.am
-+++ libguestfs-1.19.34/src/Makefile.am
-@@ -177,7 +177,7 @@ libguestfs_la_CPPFLAGS = -I$(top_srcdir)
- if HAVE_FUSE
- # XXX Unfortunately FUSE_CFLAGS defines _FILE_OFFSET_BITS=64.
- libguestfs_la_CFLAGS += $(FUSE_CFLAGS)
--libguestfs_la_LIBADD += $(FUSE_LIBS) -lulockmgr
-+libguestfs_la_LIBADD += $(FUSE_LIBS)
- endif
- 
- if HAVE_RPCGEN
-Index: libguestfs-1.19.34/tests/mount-local/Makefile.am
-===================================================================
---- libguestfs-1.19.34.orig/tests/mount-local/Makefile.am
-+++ libguestfs-1.19.34/tests/mount-local/Makefile.am
-@@ -34,7 +34,7 @@ test_parallel_mount_local_CFLAGS = \
- 	$(FUSE_CFLAGS) \
- 	$(WARN_CFLAGS) $(WERROR_CFLAGS)
- test_parallel_mount_local_LDADD = \
--	$(FUSE_LIBS) -lulockmgr \
-+	$(FUSE_LIBS) \
- 	$(top_builddir)/src/libguestfs.la
- 
- endif

libguestfs-1.19.34.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d4d54316d7d52f38a9d6d444474bef3c04c56dcab6c1498452d66078a4308125
-size 8143973

libguestfs-1.19.35.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c3a2407aa645f6ded169e91ac7a4386c879d9254183d231f097c837c13499a8a
+size 8213887

libguestfs.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Aug 30 10:24:49 CEST 2012 - ohering@suse.de
+
+- Update to version 1.19.35
+  disable java
+  remove kvm and qemu from BuildRequires, the path to qemu-kvm
+  can be passed to configure
+
 -------------------------------------------------------------------
 Wed Aug 29 19:40:04 CEST 2012 - ohering@suse.de
 

libguestfs.spec

@@ -62,9 +62,7 @@ BuildRequires:  mkinitrd
 BuildRequires:  ncurses-devel
 BuildRequires:  pcre-devel
 BuildRequires:  pkg-config
-BuildRequires:  qemu
 BuildRequires:  readline-devel
-BuildRequires:  xz
 %if %suse_version < 1210
 # perl as included in openSuSE 11.4 has this, but an older version without html_charset
 # Without the version the requires is ignored for some reason
@@ -129,14 +127,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Tools for accessing and modifying virtual machine disk images
 License:        LGPL-2.1
 Group:          System/Filesystems
-Version:        1.19.34
+Version:        1.19.35
 Release:        0
-Patch34:        libguestfs-1.19.34.patch
 Patch5:         libguestfs-1.13.14-ruby.patch
 Patch100:       libguestfs.perl.install_vendor.patch
 Patch101:       libguestfs.perl.no-rpath.patch
 Source0:        %{name}-%{version}.tar.gz
-Source1:        guestfs.tar.xz
 Source10:       libguestfs.mkinitrd.boot.sh
 Source11:       libguestfs.mkinitrd.setup.sh
 Recommends:     %{name}-data
@@ -283,23 +279,27 @@ virtual machines.
 
 %prep
 %setup -q
-%patch34 -p1
 %patch100 -p1
 %patch101 -p1
 
 %build
 # disable qemu test.
 # If the package is built within kvm the configure test will fail because it starts kvm within kvm
+# With QEMU in environment qemu and kvm packages are not needed at build time.
 export vmchannel_test=no
+export QEMU=/usr/bin/qemu-kvm
 # for configure macro below
 CFLAGS="$RPM_OPT_FLAGS -Wno-unused"
 CXXFLAGS="$RPM_OPT_FLAGS -Wno-unused"
 autoreconf -fi
 %configure \
 	--help || :
+#sed -i '1 s@^.*@#!/bin/sh -x@' configure
 %configure \
 	--enable-daemon \
 	--enable-install-daemon \
+	--with-qemu=$QEMU \
+	--without-java \
 	--disable-appliance \
 	--disable-haskell \
 	--disable-php \
@@ -316,7 +316,6 @@ make %{?jobs:-j%jobs}
 %makeinstall
 find $RPM_BUILD_ROOT \( -name "*.pod" -o -name ".packlist" \) -print0 | xargs -0 --no-run-if-empty rm -fv
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{l,}a
-#xz -cd %{S:1} | tar -C $RPM_BUILD_ROOT/%{_libdir} -xvf -
 touch %{name}.lang
 %find_lang %{name}
 #