From 6f9bece8fd82d5a018cd0501ef348b8651e7a7e7 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 13 Aug 2015 21:37:17 +0100
Subject: [PATCH] Remove patch which is now upstream.

---
 ...w-test-virt-sysprep.sh-to-be-skipped.patch | 29 -------------------
 libguestfs.spec                               |  5 +---
 2 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 0001-sysprep-Allow-test-virt-sysprep.sh-to-be-skipped.patch

diff --git a/0001-sysprep-Allow-test-virt-sysprep.sh-to-be-skipped.patch b/0001-sysprep-Allow-test-virt-sysprep.sh-to-be-skipped.patch
deleted file mode 100644
index f4d79a5..0000000
--- a/0001-sysprep-Allow-test-virt-sysprep.sh-to-be-skipped.patch
+++ /dev/null
@@ -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
-
diff --git a/libguestfs.spec b/libguestfs.spec
index fa7d5c7..e17f394 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -31,9 +31,6 @@ License:       LGPLv2+
 URL:           http://libguestfs.org/
 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:
 BuildRequires: perl(Pod::Simple)
 BuildRequires: perl(Pod::Man)
@@ -791,7 +788,6 @@ for %{name}.
 %setup -q
 
 # Apply patches, if any, here.
-%patch1 -p1
 
 # For Python 3 we must build libguestfs twice.  This creates:
 #   %{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
 - New upstream version 1.31.2.
 - 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
 - Make libguestfs-tools-c recommend libguestfs-xfs, as the default filesystem