[fedora-virt-maint] rpms/libguestfs/devel libguestfs-1.0.79-no-fuse-test.patch, NONE, 1.1 libguestfs.spec, 1.111, 1.112

[Richard W.M. Jones]

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30819

Modified Files:
	libguestfs.spec 
Added Files:
	libguestfs-1.0.79-no-fuse-test.patch 
Log Message:
Disable FUSE-related tests because Koji doesn't currently allow them.

libguestfs-1.0.79-no-fuse-test.patch:
 Makefile.am |    6 +++---
 Makefile.in |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE libguestfs-1.0.79-no-fuse-test.patch ---
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.
- at HAVE_FUSE_TRUE@TESTS = test-fuse.sh
- at HAVE_FUSE_TRUE@TESTS_ENVIRONMENT = \
- at HAVE_FUSE_TRUE@	top_builddir=..
+#@HAVE_FUSE_TRUE at TESTS = test-fuse.sh
+#@HAVE_FUSE_TRUE at TESTS_ENVIRONMENT = \
+#@HAVE_FUSE_TRUE@	top_builddir=..
 
 all: all-am
 


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- libguestfs.spec	18 Nov 2009 15:00:06 -0000	1.111
+++ libguestfs.spec	18 Nov 2009 17:28:54 -0000	1.112
@@ -5,13 +5,16 @@ Summary:     Access and modify virtual m
 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 at redhat.com> - 1.0.79-1
+* Wed Nov 18 2009 Richard W.M. Jones <rjones at 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 at redhat.com> - 1.0.78-2
 - New upstream release 1.0.78.