From 11f4aa9022c90540bc64ce0ba89a65cb396ce4b6 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@fedoraproject.org>
Date: Wed, 18 Nov 2009 17:28:54 +0000
Subject: [PATCH] Disable FUSE-related tests because Koji doesn't currently
 allow them.

---
 libguestfs-1.0.79-no-fuse-test.patch | 31 ++++++++++++++++++++++++++++
 libguestfs.spec                      | 11 ++++++++--
 2 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 libguestfs-1.0.79-no-fuse-test.patch

diff --git a/libguestfs-1.0.79-no-fuse-test.patch b/libguestfs-1.0.79-no-fuse-test.patch
new file mode 100644
index 0000000..b972f9d
--- /dev/null
+++ b/libguestfs-1.0.79-no-fuse-test.patch
@@ -0,0 +1,31 @@
+diff -ur libguestfs-1.0.79.orig/fuse/Makefile.am libguestfs-1.0.79/fuse/Makefile.am
+--- libguestfs-1.0.79.orig/fuse/Makefile.am	2009-11-18 13:30:50.000000000 +0000
++++ libguestfs-1.0.79/fuse/Makefile.am	2009-11-18 17:26:41.842299061 +0000
+@@ -64,8 +64,8 @@
+ 
+ # Tests.
+ 
+-TESTS = test-fuse.sh
+-TESTS_ENVIRONMENT = \
+-	top_builddir=..
++#TESTS = test-fuse.sh
++#TESTS_ENVIRONMENT = \
++#	top_builddir=..
+ 
+ endif
+diff -ur libguestfs-1.0.79.orig/fuse/Makefile.in libguestfs-1.0.79/fuse/Makefile.in
+--- libguestfs-1.0.79.orig/fuse/Makefile.in	2009-11-18 13:30:57.000000000 +0000
++++ libguestfs-1.0.79/fuse/Makefile.in	2009-11-18 17:26:51.213184201 +0000
+@@ -770,9 +770,9 @@
+ 
+ 
+ # Tests.
+-@HAVE_FUSE_TRUE@TESTS = test-fuse.sh
+-@HAVE_FUSE_TRUE@TESTS_ENVIRONMENT = \
+-@HAVE_FUSE_TRUE@	top_builddir=..
++#@HAVE_FUSE_TRUE@TESTS = test-fuse.sh
++#@HAVE_FUSE_TRUE@TESTS_ENVIRONMENT = \
++#@HAVE_FUSE_TRUE@	top_builddir=..
+ 
+ all: all-am
+ 
diff --git a/libguestfs.spec b/libguestfs.spec
index a89fe1c..fb42919 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -5,13 +5,16 @@ Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.79
-Release:     1%{?dist}
+Release:     2%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
 Source0:     http://libguestfs.org/download/%{name}-%{version}.tar.gz
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root
 
+# Disable FUSE tests, not supported in Koji at the moment.
+Patch0:      libguestfs-1.0.79-no-fuse-test.patch
+
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -321,6 +324,8 @@ Requires:    jpackage-utils
 %prep
 %setup -q
 
+%patch0 -p1
+
 mkdir -p daemon/m4
 
 
@@ -591,11 +596,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Nov 18 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.79-1
+* Wed Nov 18 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.79-2
 - New upstream release 1.0.79.
 - Adds FUSE test script and multiple fixes for FUSE (RHBZ#538069).
 - Fix virt-df in Xen (RHBZ#538041).
 - Improve speed of supermin appliance.
+- Disable FUSE-related tests because Koji doesn't currently allow them.
+  fuse: device not found, try 'modprobe fuse' first
 
 * Tue Nov 10 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.78-2
 - New upstream release 1.0.78.