From f4f4d4edede7fdcc8f4fe3eed63ab55b8390c0cb Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 24 Oct 2012 11:20:37 +0100
Subject: [PATCH] Remove upstream patch.

---
 ...ents.sh-because-of-new-debug-message.patch | 28 -------------------
 libguestfs.spec                               |  4 ---
 2 files changed, 32 deletions(-)
 delete mode 100644 0001-fish-Fix-test-events.sh-because-of-new-debug-message.patch

diff --git a/0001-fish-Fix-test-events.sh-because-of-new-debug-message.patch b/0001-fish-Fix-test-events.sh-because-of-new-debug-message.patch
deleted file mode 100644
index f5dd449..0000000
--- a/0001-fish-Fix-test-events.sh-because-of-new-debug-message.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 91c07d2a06fd4ec33db8d7737bfd73f61aa645fc Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Wed, 24 Oct 2012 11:14:56 +0100
-Subject: [PATCH] fish: Fix test-events.sh because of new debug message.
-
-Commit 2e90f4312928f332f8997b52be3fe54f20920242 added a debug message
-which isn't filtered out by the set of grep -v's in this test.
-Therefore this test would fail when run with LIBGUESTFS_DEBUG=1.
----
- fish/test-events.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fish/test-events.sh b/fish/test-events.sh
-index b3684a8..79957ed 100755
---- a/fish/test-events.sh
-+++ b/fish/test-events.sh
-@@ -22,7 +22,7 @@ set -e
- 
- rm -f test.out
- 
--./guestfish -a /dev/null <<'EOF' | grep -v get_verbose | grep -v get_trace | grep -v 'library .*0x' > test.out
-+./guestfish -a /dev/null <<'EOF' | grep -v get_verbose | grep -v get_trace | grep -v 'library .*0x' | grep -v 'library command' > test.out
- trace true
- 
- event ev1 * "echo $EVENT $@"
--- 
-1.7.11.4
-
diff --git a/libguestfs.spec b/libguestfs.spec
index 4f45d5c..e0148f2 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -43,9 +43,6 @@ Patch2:        libguestfs-1.19.2-remove-udev-from-packagelist.patch
 # on i386 only.  This works around a bug in 32-bit qemu (RHBZ#857026).
 Patch3:        0001-i386-Add-noapic-flag-to-work-around-a-qemu-or-kernel.patch
 
-# Upstream patch to fix guestfish tests.
-Patch4:        0001-fish-Fix-test-events.sh-because-of-new-debug-message.patch
-
 %if 0%{?rhel} >= 7
 ExclusiveArch: x86_64
 %endif
@@ -698,7 +695,6 @@ autoreconf -i
 %endif
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 mkdir -p daemon/m4