From 656a67d0b6a43b87484712b0e5f2ab4a8cbcca5f Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 24 Oct 2019 14:30:44 +0100
Subject: [PATCH] New upstream version 1.15.6.

---
 nbdkit.spec | 19 ++++---------------
 sources     |  4 ++--
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/nbdkit.spec b/nbdkit.spec
index 57b452d..3caf080 100644
--- a/nbdkit.spec
+++ b/nbdkit.spec
@@ -27,7 +27,7 @@
 %global source_directory 1.15-development
 
 Name:           nbdkit
-Version:        1.15.5
+Version:        1.15.6
 Release:        1%{?dist}
 Summary:        NBD server
 
@@ -41,13 +41,6 @@ Source1:        http://libguestfs.org/download/nbdkit/%{source_directory}/%{name
 Source2:       libguestfs.keyring
 %endif
 
-# Make tests/test-captive.sh and tests/test-socket-activation stable.
-# All upstream after nbdkit 1.15.5.
-Patch1:        0001-tests-test-captive.sh-Increase-sleep-times.patch
-Patch2:        0002-tests-test-captive.sh-Remove-useless-sleep.patch
-Patch3:        0003-tests-test-socket-activation.c-Don-t-check-nbdkit-ex.patch
-Patch4:        0004-tests-test-captive.sh-Better-test-for-pidfile.patch
-
 %if 0%{patches_touch_autotools}
 BuildRequires: autoconf, automake, libtool
 %endif
@@ -602,13 +595,6 @@ make %{?_smp_mflags}
 # Delete libtool crap.
 find $RPM_BUILD_ROOT -name '*.la' -delete
 
-# Delete the VDDK plugin on !x86 architectures since it is not
-# applicable there.
-%ifnarch %{ix86} x86_64
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/nbdkit-vddk-plugin.so
-rm $RPM_BUILD_ROOT%{_mandir}/man1/nbdkit-vddk-plugin.1*
-%endif
-
 # If cargo happens to be installed on the machine then the
 # rust plugin is built.  Delete it if this happens.
 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/nbdkit-rust-plugin.3*
@@ -916,6 +902,9 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
+* Fri Oct 24 2019 Richard W.M. Jones <rjones@redhat.com> - 1.15.6-1
+- New upstream version 1.15.6.
+
 * Sat Oct 19 2019 Richard W.M. Jones <rjones@redhat.com> - 1.15.5-1
 - New upstream release 1.15.5.
 
diff --git a/sources b/sources
index be4f378..b4f9d98 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (nbdkit-1.15.5.tar.gz) = ab148286c5c307d2e4c6c6ad5796f752f4f332d478cd71b984b6d7329c9a392e2e27bfc9a70b4927b3610b346c39d77eceb19de5102989340715e3e884d89429
-SHA512 (nbdkit-1.15.5.tar.gz.sig) = 8d4b4a9d95c99ec4c8643566887f1ab077a54b1638a1b759b7922a731b955569b3326db181fb7c1f58e01f97255b3e989cbf4fd28404f46bcbe15499c579a250
+SHA512 (nbdkit-1.15.6.tar.gz) = 680c6ae630ddfe848f7157d3f1c05874d9abef2184a06f4fc69b92a74ea60299a8c1e0006215cfeb32573e21febd9e85e423f1ed1e05669f79fd3fe411c040a0
+SHA512 (nbdkit-1.15.6.tar.gz.sig) = f7a489012dc01963521de619c1f2c035247c845ee514e1d901e547f874da292888635daf296f6b4652c26ef0a07400de56b285e3a00742d1e93515302214bf28