rpms
/
libguestfs
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebase no-fuse-test patch to latest version.

This commit is contained in:
Richard W.M. Jones 2010-11-24 22:34:12 +00:00
parent 1ab5e294eb
commit 1210b14c1e
3 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libguestfs-1.0.79-no-fuse-test.patch
View File

@ -1,31 +0,0 @@
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

33
libguestfs-1.7.13-no-fuse-test.patch Normal file
View File

@ -0,0 +1,33 @@
diff -ur libguestfs-1.7.13.old/fuse/Makefile.am libguestfs-1.7.13/fuse/Makefile.am
--- libguestfs-1.7.13.old/fuse/Makefile.am 2010-11-24 20:12:08.000000000 +0000
+++ libguestfs-1.7.13/fuse/Makefile.am 2010-11-24 22:31:13.522116969 +0000
@@ -77,8 +77,8 @@
# Tests.
-TESTS = test-fuse.sh
-TESTS_ENVIRONMENT = \
- top_builddir=..
+#TESTS = test-fuse.sh
+#TESTS_ENVIRONMENT = \
+# top_builddir=..
endif
Only in libguestfs-1.7.13/fuse: Makefile.am.orig
diff -ur libguestfs-1.7.13.old/fuse/Makefile.in libguestfs-1.7.13/fuse/Makefile.in
--- libguestfs-1.7.13.old/fuse/Makefile.in 2010-11-24 20:17:24.000000000 +0000
+++ libguestfs-1.7.13/fuse/Makefile.in 2010-11-24 22:31:13.524116997 +0000
@@ -1055,9 +1055,9 @@
@HAVE_FUSE_TRUE@noinst_DATA = $(top_builddir)/html/guestmount.1.html
# 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
Only in libguestfs-1.7.13/fuse: Makefile.in.orig

7
libguestfs.spec
View File

@ -42,7 +42,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs
Epoch: 1
Version: 1.7.13
Release: 1%{?dist}
Release: 2%{?dist}
License: LGPLv2+
Group: Development/Libraries
URL: http://libguestfs.org/
@ -50,7 +50,7 @@ Source0: http://libguestfs.org/download/1.7-development/%{name}-%{version}
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
Patch0: libguestfs-1.7.13-no-fuse-test.patch
# Basic build requirements:
BuildRequires: /usr/bin/pod2man
@ -712,11 +712,12 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Nov 24 2010 Richard Jones <rjones@redhat.com> - 1:1.7.13-1
* Wed Nov 24 2010 Richard Jones <rjones@redhat.com> - 1:1.7.13-2
- New upstream development version 1.7.13.
- New manual pages containing example code.
- Ship examples for C, OCaml, Ruby, Python.
- Don't ship HTML versions of man pages.
- Rebase no-fuse-test patch to latest version.
* Tue Nov 23 2010 Richard Jones <rjones@redhat.com> - 1:1.7.12-1
- New upstream development version 1.7.12.