diff --git a/libguestfs-1.5.16-disable-test-copy.patch b/libguestfs-1.5.16-disable-test-copy.patch new file mode 100644 index 0000000..8d56aac --- /dev/null +++ b/libguestfs-1.5.16-disable-test-copy.patch @@ -0,0 +1,53 @@ +diff -ur libguestfs-1.5.16.orig/regressions/Makefile.am libguestfs-1.5.16/regressions/Makefile.am +--- libguestfs-1.5.16.orig/regressions/Makefile.am 2010-09-10 13:13:56.000000000 +0100 ++++ libguestfs-1.5.16/regressions/Makefile.am 2010-09-16 11:52:56.042767630 +0100 +@@ -34,7 +34,6 @@ + rhbz580246.sh \ + test-cancellation-download-librarycancels.sh \ + test-cancellation-upload-daemoncancels.sh \ +- test-copy.sh \ + test-find0.sh \ + test-luks.sh \ + test-lvm-filtering.sh \ +@@ -49,7 +48,8 @@ + test-stringlist.sh + + SKIPPED_TESTS = \ +- test-bootbootboot.sh ++ test-bootbootboot.sh \ ++ test-copy.sh + + FAILING_TESTS = \ + test-qemudie-launchfail.sh +diff -ur libguestfs-1.5.16.orig/regressions/Makefile.in libguestfs-1.5.16/regressions/Makefile.in +--- libguestfs-1.5.16.orig/regressions/Makefile.in 2010-09-15 22:09:52.000000000 +0100 ++++ libguestfs-1.5.16/regressions/Makefile.in 2010-09-16 11:57:14.320115536 +0100 +@@ -79,12 +79,12 @@ + rhbz503169c10.sh rhbz503169c13.sh rhbz557655.sh rhbz576879.sh \ + rhbz578407.sh rhbz580246.sh \ + test-cancellation-download-librarycancels.sh \ +- test-cancellation-upload-daemoncancels.sh test-copy.sh \ +- test-find0.sh test-luks.sh test-lvm-filtering.sh \ +- test-lvm-mapping.pl test-noexec-stack.pl \ +- test-qemudie-killsub.sh test-qemudie-midcommand.sh \ +- test-qemudie-synch.sh test-read_file.sh test-remote.sh \ +- test-reopen.sh test-stringlist.sh ++ test-cancellation-upload-daemoncancels.sh test-find0.sh \ ++ test-luks.sh test-lvm-filtering.sh test-lvm-mapping.pl \ ++ test-noexec-stack.pl test-qemudie-killsub.sh \ ++ test-qemudie-midcommand.sh test-qemudie-synch.sh \ ++ test-read_file.sh test-remote.sh test-reopen.sh \ ++ test-stringlist.sh + check_PROGRAMS = rhbz501893$(EXEEXT) + subdir = regressions + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -987,7 +987,8 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + SKIPPED_TESTS = \ +- test-bootbootboot.sh ++ test-bootbootboot.sh \ ++ test-copy.sh + + FAILING_TESTS = \ + test-qemudie-launchfail.sh diff --git a/libguestfs.spec b/libguestfs.spec index 6080d69..cb0cd62 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -42,7 +42,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.5.16 -Release: 1%{?dist} +Release: 1%{?dist}.1 License: LGPLv2+ Group: Development/Libraries URL: http://libguestfs.org/ @@ -52,6 +52,9 @@ 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 +# Disable test-copy.sh because of missing /dev/fd bug in mock (RHBZ#526414). +Patch1: libguestfs-1.5.16-disable-test-copy.patch + # Basic build requirements: BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2text @@ -410,6 +413,7 @@ php-%{name} contains PHP bindings for %{name}. %setup -q %patch0 -p1 +%patch1 -p1 mkdir -p daemon/m4 @@ -739,6 +743,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Sep 16 2010 Richard Jones - 1:1.5.16-1.fc14.1 +- Disable test-copy.sh because of missing /dev/fd bug in mock (RHBZ#526414). + * Wed Sep 15 2010 Richard Jones - 1:1.5.16-1 - New upstream development version 1.5.16.