diff --git a/0001-qemu-Fix-transcription-error-in-conversion-of-yajl-t.patch b/0001-qemu-Fix-transcription-error-in-conversion-of-yajl-t.patch deleted file mode 100644 index fdc7d26..0000000 --- a/0001-qemu-Fix-transcription-error-in-conversion-of-yajl-t.patch +++ /dev/null @@ -1,29 +0,0 @@ -From e79286f71738d9385157d9e87211be02645722c3 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Thu, 29 Mar 2018 20:18:34 +0100 -Subject: [PATCH] qemu: Fix transcription error in conversion of yajl to - jansson. - -This broke qemu mandatory locking detection. - -Fixes commit bd1c5c9f4dcf38458099db8a0bf4659a07ef055d. ---- - lib/qemu.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/qemu.c b/lib/qemu.c -index a50eca988..3e7f15946 100644 ---- a/lib/qemu.c -+++ b/lib/qemu.c -@@ -616,7 +616,7 @@ guestfs_int_qemu_mandatory_locking (guestfs_h *g, - members = json_object_get (v, "members"); - if (json_is_array (members)) { - json_array_foreach (members, j, m) { -- name = json_object_get (v, "name"); -+ name = json_object_get (m, "name"); - if (json_is_string (name) && - STREQ (json_string_value (name), "locking")) - return 1; --- -2.15.1 - diff --git a/libguestfs.spec b/libguestfs.spec index ccdac56..68fa44e 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -49,9 +49,6 @@ Source0: http://libguestfs.org/download/1.38-stable/%{name}-%{version}.tar Source1: http://libguestfs.org/download/1.38-stable/%{name}-%{version}.tar.gz.sig %endif -# Upstream patch fixes qemu mandatory locking detection. -Patch1: 0001-qemu-Fix-transcription-error-in-conversion-of-yajl-t.patch - # Replacement README file for Fedora users. Source4: README-replacement.in @@ -1409,6 +1406,7 @@ install -m 0644 utils/boot-benchmark/boot-benchmark.1 $RPM_BUILD_ROOT%{_mandir}/ %changelog * Sun Apr 22 2018 Richard W.M. Jones - 1:1.39.3-1 - New upstream version 1.39.3. +- Remove upstream patch. * Tue Apr 10 2018 Iryna Shcherbina - 1:1.39.2-3 - Update Python 2 dependency declarations to new packaging standards