From e09228e8e7039822c8fadbab8fa5aa784f073820 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 27 Jun 2012 17:24:56 +0100
Subject: [PATCH] Remove patch which is now upstream.

---
 ...s-gjs-exception-behaviour-changed-fi.patch | 32 -------------------
 libguestfs.spec                               |  4 ---
 2 files changed, 36 deletions(-)
 delete mode 100644 0001-gobject-bindtests-gjs-exception-behaviour-changed-fi.patch

diff --git a/0001-gobject-bindtests-gjs-exception-behaviour-changed-fi.patch b/0001-gobject-bindtests-gjs-exception-behaviour-changed-fi.patch
deleted file mode 100644
index 984db2a..0000000
--- a/0001-gobject-bindtests-gjs-exception-behaviour-changed-fi.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 6afb7336e33dc28c4fd1a4545a8298ee36c10723 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Wed, 27 Jun 2012 10:54:02 +0100
-Subject: [PATCH] gobject: bindtests: gjs exception behaviour changed, fix
- test.
-
-When libguestfs calls 'error (g, "error")', gjs in F17 throws
-error.message == "Error invoking Guestfs.test0rinterr: error"
-
-In F18, error.message is simply the string "error".
-
-Fix the test so it works for both cases.
----
- gobject/bindtests-manual.js |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gobject/bindtests-manual.js b/gobject/bindtests-manual.js
-index 84a1546..8f4ef15 100644
---- a/gobject/bindtests-manual.js
-+++ b/gobject/bindtests-manual.js
-@@ -26,7 +26,7 @@ function check_error(f) {
-     g[f]();
-   } catch (error) {
-     threw = true;
--    if (!error.message.match(/: error$/)) {
-+    if (!error.message.match(/error$/)) {
-       print(f + " threw unexpected error: " + error.message);
-       fail = true;
-     }
--- 
-1.7.10.2
-
diff --git a/libguestfs.spec b/libguestfs.spec
index c737683..bf183e5 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -40,9 +40,6 @@ BuildRequires: autoconf, automake, libtool, gettext-devel
 # patch.
 Patch4:        libguestfs-1.19.2-remove-udev-from-packagelist.patch
 
-# Upstream patch to fix GObject/Javascript tests.
-Patch5:        0001-gobject-bindtests-gjs-exception-behaviour-changed-fi.patch
-
 %if 0%{?rhel} >= 7
 ExclusiveArch: x86_64
 %endif
@@ -686,7 +683,6 @@ autoreconf -i
 %endif
 
 %patch4 -p1
-%patch5 -p1
 
 mkdir -p daemon/m4