- Update to version 1.19.34

enable fuse support

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

libguestfs-1.19.32.tar.gz

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

libguestfs-1.19.34.patch

@@ -0,0 +1,60 @@
+---
+ examples/Makefile.am          |    2 +-
+ fuse/Makefile.am              |    2 +-
+ fuse/Makefile.in              |    2 +-
+ src/Makefile.am               |    2 +-
+ tests/mount-local/Makefile.am |    2 +-
+ 5 files changed, 5 insertions(+), 5 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

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

libguestfs.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Aug 29 14:41:16 CEST 2012 - ohering@suse.de
+
+- Update to version 1.19.34
+  enable fuse support
+
 -------------------------------------------------------------------
 Mon Aug 20 12:07:42 CEST 2012 - ohering@suse.de
 

libguestfs.spec

@@ -21,6 +21,7 @@
 %define with_python 1
 %define with_perl 1
 %define with_ruby 0
+%define with_fuse 1
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -56,6 +57,13 @@ BuildRequires:  xz
 BuildRequires:  perl(Pod::Simple::XHTML) = 3.23
 %endif
 #
+%if %{with_fuse}
+BuildRequires:  fuse-devel
+%define _configure_fuse --enable-fuse
+%else
+%define _configure_fuse --disable-fuse
+%endif
+#
 %if %{with_ocaml}
 BuildRequires:  ocaml
 BuildRequires:  ocaml-findlib
@@ -102,15 +110,16 @@ BuildRequires:  rubygem-rake
 %define _configure_ruby --disable-ruby
 %endif
 #
-# libconfig-devel fuse-devel libulockmgr1
+# libconfig-devel
 Url:            http://libguestfs.org/
 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.32
+Version:        1.19.34
 Release:        0
 Patch:          libguestfs-1.19.30.patch
+Patch34:        libguestfs-1.19.34.patch
 Patch1:         libguestfs-1.13.14-disable-erlang.patch
 Patch2:         libguestfs-1.13.14-provided-appliance.patch
 Patch3:         libguestfs-1.13.14-no-machine.patch
@@ -262,6 +271,7 @@ virtual machines.
 %prep
 %setup -q
 %patch -p1
+%patch34 -p1
 
 %build
 # disable qemu test.
@@ -277,6 +287,7 @@ autoreconf -fi
 	--disable-appliance \
 	--disable-haskell \
 	--disable-php \
+	%{_configure_fuse} \
 	%{_configure_ocaml} \
 	%{_configure_perl} \
 	%{_configure_python} \