From 62f1e22b90558fab200b0c8edd4a13e30b9074b1 Mon Sep 17 00:00:00 2001 From: Richard W.M. Jones Date: Oct 01 2010 20:11:39 +0000 Subject: * Fri Oct 1 2010 Richard Jones - 1:1.5.21-1 - New upstream development version 1.5.21. - Remove upstream patch. - Remove mock patch, since /dev/fd is supposed to exist now. --- diff --git a/.gitignore b/.gitignore index 88f9c53..96e4f69 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ libguestfs-1.5.2.tar.gz /libguestfs-1.5.16.tar.gz /libguestfs-1.5.17.tar.gz /libguestfs-1.5.18.tar.gz +/libguestfs-1.5.21.tar.gz diff --git a/libguestfs-1.5.18-disable-test-copy.patch b/libguestfs-1.5.18-disable-test-copy.patch deleted file mode 100644 index 6168025..0000000 --- a/libguestfs-1.5.18-disable-test-copy.patch +++ /dev/null @@ -1,54 +0,0 @@ -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-1.5.18-test-built-guestfish.patch b/libguestfs-1.5.18-test-built-guestfish.patch deleted file mode 100644 index b146353..0000000 --- a/libguestfs-1.5.18-test-built-guestfish.patch +++ /dev/null @@ -1,42 +0,0 @@ -From df69543720de5bf7dd1a734c3bef6d191ceeab33 Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones -Date: Wed, 22 Sep 2010 17:43:34 +0100 -Subject: [PATCH] regressions: Test just-built guestfish. - -Instead of testing the installed /usr/bin/guestfish. - -This fixes commit ddda0f7bd00a37274dae38f4ce93955b8cfdf7d7. ---- - regressions/test-guestfish-a.sh | 2 +- - regressions/test-guestfish-d.sh | 3 ++- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/regressions/test-guestfish-a.sh b/regressions/test-guestfish-a.sh -index 8e990ed..8847b85 100755 ---- a/regressions/test-guestfish-a.sh -+++ b/regressions/test-guestfish-a.sh -@@ -23,6 +23,6 @@ set -e - rm -f test.img - - truncate -s 10M test.img --guestfish -a test.img test.xml < - EOF - --guestfish -c "test://$cwd/test.xml" --ro -d guest -x test.out 2>&1 -+../fish/guestfish -c "test://$cwd/test.xml" --ro -d guest -x \ -+ test.out 2>&1 - grep -sq '^add_drive_ro.*test.img' test.out - - rm -f test.img test.xml test.out --- -1.7.2.3 - diff --git a/libguestfs.spec b/libguestfs.spec index b452c18..d62cda0 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -41,8 +41,8 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.5.18 -Release: 1%{?dist}.2 +Version: 1.5.21 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://libguestfs.org/ @@ -52,12 +52,6 @@ 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.18-disable-test-copy.patch - -# Fix tests so they test the built guestfish (upstream). -Patch2: libguestfs-1.5.18-test-built-guestfish.patch - # Basic build requirements: BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2text @@ -417,8 +411,6 @@ php-%{name} contains PHP bindings for %{name}. %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 mkdir -p daemon/m4 @@ -748,6 +740,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 1 2010 Richard Jones - 1:1.5.21-1 +- New upstream development version 1.5.21. +- Remove upstream patch. +- Remove mock patch, since /dev/fd is supposed to exist now. + * Wed Sep 22 2010 Richard Jones - 1:1.5.18-1.fc14.2 - Fix tests so they test the built guestfish, not /usr/bin/guestfish. diff --git a/sources b/sources index aadc40d..d6cb1c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -133728f7ce710c2a214283fc0fbbd42c libguestfs-1.5.18.tar.gz +549166bb9093cefc3e2c42452444bd2d libguestfs-1.5.21.tar.gz