Add second upstream patch to fix the tests.

0001-tests-Make-test-partition2.sh-depend-on-disk-file-be.patch

@@ -1,8 +1,8 @@
 From 1a0c80cbe9f561fd6a8801c3bfda1783ce40080f Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 22 Jan 2019 23:22:55 +0000
-Subject: [PATCH] =?UTF-8?q?tests:=20Make=20test-partition2.sh=20depend=20o?=
+Subject: [PATCH 1/2] =?UTF-8?q?tests:=20Make=20test-partition2.sh=20depend?=
- =?UTF-8?q?n=20=E2=80=98disk=E2=80=99=20file=20being=20created.?=
+ =?UTF-8?q?=20on=20=E2=80=98disk=E2=80=99=20file=20being=20created.?=
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

0002-tests-Name-endif-HAVE_GUESTFISH.patch

@@ -0,0 +1,31 @@
+From cfd884c1ad379a5127fca72d2305ae3373bcb989 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Wed, 23 Jan 2019 09:36:44 +0000
+Subject: [PATCH 2/2] tests: Name endif HAVE_GUESTFISH.
+
+The Fedora build removes if HAVE_GUESTFISH / endif HAVE_GUESTFISH on
+some architectures, but it does this by matching the reminder comment
+on the endif.  If this is missing it gets confused.
+
+Fixes commit 1a0c80cbe9f561fd6a8801c3bfda1783ce40080f
+and commit bf41e6b04b683570e8b059527ef604add2d42705.
+---
+ tests/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 859b6ed..948f14b 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -801,7 +801,7 @@ TESTS += test-offset2.sh
+ TESTS += test-partition1.sh
+ if HAVE_GUESTFISH
+ TESTS += test-partition2.sh
+-endif
++endif HAVE_GUESTFISH
+ 
+ # truncate filter tests.
+ TESTS += \
+-- 
+2.20.1
+

nbdkit.spec

@@ -46,6 +46,7 @@ Source2:       libguestfs.keyring
 %endif
 
 Patch1: 0001-tests-Make-test-partition2.sh-depend-on-disk-file-be.patch
+Patch2: 0002-tests-Name-endif-HAVE_GUESTFISH.patch
 
 %if 0%{patches_touch_autotools}
 BuildRequires: autoconf, automake, libtool