Remove patch which is now upstream.

This commit is contained in:
Richard W.M. Jones 2015-08-13 21:37:17 +01:00
parent 95fd6ca756
commit 6f9bece8fd
2 changed files with 1 additions and 33 deletions

View File

@ -1,29 +0,0 @@
From d9c63708311f9b5c309dd1a17b25329f99bac710 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sun, 2 Aug 2015 17:33:07 +0100
Subject: [PATCH] sysprep: Allow test-virt-sysprep.sh to be skipped.
It fails in Fedora Rawhide because LVM is broken (RHBZ#1237136).
---
sysprep/test-virt-sysprep.sh | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/sysprep/test-virt-sysprep.sh b/sysprep/test-virt-sysprep.sh
index 7ec96d0..14cd492 100755
--- a/sysprep/test-virt-sysprep.sh
+++ b/sysprep/test-virt-sysprep.sh
@@ -19,6 +19,11 @@
export LANG=C
set -e
+if [ -n "$SKIP_TEST_VIRT_SYSPREP_SH" ]; then
+ echo "$0: test skipped because environment variable is set."
+ exit 77
+fi
+
# Get a comma-separated list of the enabled-by-default operations.
operations=$(
virt-sysprep --list-operations |
--
2.5.0

View File

@ -31,9 +31,6 @@ License: LGPLv2+
URL: http://libguestfs.org/ URL: http://libguestfs.org/
Source0: http://libguestfs.org/download/1.29-development/%{name}-%{version}.tar.gz Source0: http://libguestfs.org/download/1.29-development/%{name}-%{version}.tar.gz
# Upstream commit d9c63708311f9b5c309dd1a17b25329f99bac710.
Patch1: 0001-sysprep-Allow-test-virt-sysprep.sh-to-be-skipped.patch
# Basic build requirements: # Basic build requirements:
BuildRequires: perl(Pod::Simple) BuildRequires: perl(Pod::Simple)
BuildRequires: perl(Pod::Man) BuildRequires: perl(Pod::Man)
@ -791,7 +788,6 @@ for %{name}.
%setup -q %setup -q
# Apply patches, if any, here. # Apply patches, if any, here.
%patch1 -p1
# For Python 3 we must build libguestfs twice. This creates: # For Python 3 we must build libguestfs twice. This creates:
# %{name}-%{version}/ # %{name}-%{version}/
@ -1381,6 +1377,7 @@ rm -r $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/dllv2v_test_harness*
* Thu Aug 13 2015 Richard W.M. Jones <rjones@redhat.com> - 1:1.31.2-1 * Thu Aug 13 2015 Richard W.M. Jones <rjones@redhat.com> - 1:1.31.2-1
- New upstream version 1.31.2. - New upstream version 1.31.2.
- Enable tests on i686, arm and aarch64. - Enable tests on i686, arm and aarch64.
- Remove patch which is now upstream.
* Fri Aug 7 2015 Pino Toscano <ptoscano@redhat.com> - 1:1.31.1-3 * Fri Aug 7 2015 Pino Toscano <ptoscano@redhat.com> - 1:1.31.1-3
- Make libguestfs-tools-c recommend libguestfs-xfs, as the default filesystem - Make libguestfs-tools-c recommend libguestfs-xfs, as the default filesystem