From bc6062228e4295902f4ee39a8bf0e19b8e05412d Mon Sep 17 00:00:00 2001 From: Richard W.M. Jones Date: Sep 22 2010 14:52:43 +0000 Subject: Rebase test-copy patch. --- diff --git a/libguestfs-1.5.16-disable-test-copy.patch b/libguestfs-1.5.16-disable-test-copy.patch deleted file mode 100644 index 8d56aac..0000000 --- a/libguestfs-1.5.16-disable-test-copy.patch +++ /dev/null @@ -1,53 +0,0 @@ -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-1.5.18-disable-test-copy.patch b/libguestfs-1.5.18-disable-test-copy.patch new file mode 100644 index 0000000..6168025 --- /dev/null +++ b/libguestfs-1.5.18-disable-test-copy.patch @@ -0,0 +1,54 @@ +diff -ur libguestfs-1.5.18.old/regressions/Makefile.am libguestfs-1.5.18/regressions/Makefile.am +--- libguestfs-1.5.18.old/regressions/Makefile.am 2010-09-22 14:11:40.000000000 +0100 ++++ libguestfs-1.5.18/regressions/Makefile.am 2010-09-22 15:48:22.464936941 +0100 +@@ -34,7 +34,6 @@ + rhbz580246.sh \ + test-cancellation-download-librarycancels.sh \ + test-cancellation-upload-daemoncancels.sh \ +- test-copy.sh \ + test-find0.sh \ + test-guestfish-a.sh \ + test-guestfish-d.sh \ +@@ -51,7 +50,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.18.old/regressions/Makefile.in libguestfs-1.5.18/regressions/Makefile.in +--- libguestfs-1.5.18.old/regressions/Makefile.in 2010-09-22 14:43:08.000000000 +0100 ++++ libguestfs-1.5.18/regressions/Makefile.in 2010-09-22 15:49:06.557914577 +0100 +@@ -79,13 +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-guestfish-a.sh test-guestfish-d.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-guestfish-a.sh test-guestfish-d.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 +@@ -986,7 +985,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 7a94b1f..31d440a 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.18 -Release: 1%{?dist} +Release: 1%{?dist}.1 License: LGPLv2+ Group: Development/Libraries URL: http://libguestfs.org/ @@ -53,7 +53,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root 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 +Patch1: libguestfs-1.5.18-disable-test-copy.patch # Basic build requirements: BuildRequires: /usr/bin/pod2man @@ -744,6 +744,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Sep 22 2010 Richard Jones - 1:1.5.18-1.fc14.1 +- Rebase test-copy patch. + * Wed Sep 22 2010 Richard Jones - 1:1.5.18-1 - New upstream development version 1.5.18. - Note that guestfish '-a' and '-d' options were broken in 1.5.17, so