New upstream development version 1.21.8.

Remove upstream patches.

0001-cc-Add-fPIC-shared-to-DCFLAGS-rather-than-in-the-plu.patch

@@ -1,48 +0,0 @@
-From 1271945aa9144090f9c74c1915c4c1d431344df3 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Thu, 4 Jun 2020 14:13:46 +0100
-Subject: [PATCH 1/2] cc: Add -fPIC -shared to -DCFLAGS rather than in the
- plugin.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This fixes the output of ‘nbdkit cc --dump-plugin’ so it matches the
-documentation, and it's slightly cleaner than doing this munging in
-the cc plugin source code.
-
-Fixes: commit a4339e3c3c17d8b95ddf0b20cf015de5078620ec
----
- plugins/cc/Makefile.am | 2 +-
- plugins/cc/cc.c        | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/plugins/cc/Makefile.am b/plugins/cc/Makefile.am
-index 6b02e891..d7e709f8 100644
---- a/plugins/cc/Makefile.am
-+++ b/plugins/cc/Makefile.am
-@@ -42,7 +42,7 @@ nbdkit_cc_plugin_la_SOURCES = \
- 
- nbdkit_cc_plugin_la_CPPFLAGS = \
- 	-DCC="\"$(CC)\"" \
--	-DCFLAGS="\"$(CFLAGS)\"" \
-+	-DCFLAGS="\"$(CFLAGS) -fPIC -shared\"" \
- 	-I$(top_srcdir)/common/utils \
- 	-I$(top_srcdir)/include \
- 	-I. \
-diff --git a/plugins/cc/cc.c b/plugins/cc/cc.c
-index 2139cf62..e55c5e76 100644
---- a/plugins/cc/cc.c
-+++ b/plugins/cc/cc.c
-@@ -53,7 +53,7 @@ static bool unlink_on_exit = false;
- 
- /* C compiler and flags. */
- static const char *cc = CC;
--static const char *cflags = CFLAGS " -fPIC -shared";
-+static const char *cflags = CFLAGS;
- static const char *extra_cflags;
- 
- /* List of parameters for the subplugin. */
--- 
-2.25.0
-

0002-cc-Run-test-against-local-nbdkit-plugin.h-not-instal.patch

@@ -1,49 +0,0 @@
-From 28e66a6f4999ed7edf51ca268d6831f3d11dcb2e Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Thu, 4 Jun 2020 14:28:51 +0100
-Subject: [PATCH 2/2] cc: Run test against local <nbdkit-plugin.h>, not
- installed.
-
-The problem was revealed when trying to compile nbdkit 1.21.7 in
-Fedora Koji.
-
-Fixes: commit a4339e3c3c17d8b95ddf0b20cf015de5078620ec
----
- plugins/cc/nbdkit-cc-plugin.pod | 5 +++--
- tests/test-shebang-cc.sh        | 1 +
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/plugins/cc/nbdkit-cc-plugin.pod b/plugins/cc/nbdkit-cc-plugin.pod
-index c8ef3950..ecd7a81e 100644
---- a/plugins/cc/nbdkit-cc-plugin.pod
-+++ b/plugins/cc/nbdkit-cc-plugin.pod
-@@ -27,11 +27,12 @@ L<nbdkit-plugin(3)>.
- Simple plugins from the nbdkit source tree can be compiled and run
- directly using commands such as:
- 
-- $ nbdkit cc plugins/example1/example1.c EXTRA_CFLAGS="-I."
-+ $ nbdkit cc plugins/example1/example1.c EXTRA_CFLAGS="-I. -Iinclude"
- 
- You can also read the source from stdin using C<->:
- 
-- $ nbdkit cc - EXTRA_CFLAGS="-I." < plugins/example1/example1.c
-+ $ nbdkit cc - EXTRA_CFLAGS="-I. -Iinclude" \
-+             < plugins/example1/example1.c
- 
- To replace the compiler flags:
- 
-diff --git a/tests/test-shebang-cc.sh b/tests/test-shebang-cc.sh
-index 7f15ebff..83d9815e 100755
---- a/tests/test-shebang-cc.sh
-+++ b/tests/test-shebang-cc.sh
-@@ -45,6 +45,7 @@ fi
- requires guestfish --version
- 
- $script -fv -U - \
-+        EXTRA_CFLAGS="-I$SRCDIR/../include" \
-         --run '
-     guestfish \
-         add "" protocol:nbd server:unix:$unixsocket : \
--- 
-2.25.0
-

nbdkit.spec

@@ -38,13 +38,13 @@ ExclusiveArch:  x86_64
 %global verify_tarball_signature 1
 
 # If there are patches which touch autotools files, set this to 1.
-%global patches_touch_autotools 1
+%global patches_touch_autotools %{nil}
 
 # The source directory.
 %global source_directory 1.21-development
 
 Name:           nbdkit
-Version:        1.21.7
+Version:        1.21.8
 Release:        1%{?dist}
 Summary:        NBD server
 
@@ -58,10 +58,6 @@ Source1:        http://libguestfs.org/download/nbdkit/%{source_directory}/%{name
 Source2:       libguestfs.keyring
 %endif
 
-# Upstream patches that fix the cc plugin.
-Patch1:        0001-cc-Add-fPIC-shared-to-DCFLAGS-rather-than-in-the-plu.patch
-Patch2:        0002-cc-Run-test-against-local-nbdkit-plugin.h-not-instal.patch
-
 %if 0%{patches_touch_autotools}
 BuildRequires: autoconf, automake, libtool
 %endif
@@ -1015,6 +1011,10 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
+* Tue Jun  9 2020 Richard W.M. Jones <rjones@redhat.com> - 1.21.8-1
+- New upstream development version 1.21.8.
+- Remove upstream patches.
+
 * Thu Jun  4 2020 Richard W.M. Jones <rjones@redhat.com> - 1.21.7-1
 - New upstream development version 1.21.7.
 - New nbdkit-cc-plugin subpackage.

sources

@@ -1,2 +1,2 @@
-SHA512 (nbdkit-1.21.7.tar.gz) = dc3c324895c11ebba7cd3e7b10351e3d3567ae773b81c2abc4f3593a128a5a41cb6ae0d53929410bb9306c4281f11224dfe841fc6f29f92b3af964e36a93252d
+SHA512 (nbdkit-1.21.8.tar.gz) = 94d118c544e3375814d31375b6bafa27949d9b40ba9a3b75b88afb62fee56554dba6ead54100e6034ffebad785ce8d4f5fe4eed6a7cb042f23dc294a32188836
-SHA512 (nbdkit-1.21.7.tar.gz.sig) = 05e99ec5bd24dd2416f0a20ca4013c5bbe526a7b804e78a25e44dfe9eb6aa2e191446aefce23b98e93b10b9ddea5e210629c7fd6cbe630a5fc2bb16cf6ceb9df
+SHA512 (nbdkit-1.21.8.tar.gz.sig) = 3f43ba509e78c5824e412b1024aacc6ac47ead95d2abc55057112d37d1325268509405db23961087f475ff41e41c229e89f0e0a4bc6a05c4a599ae49860f5096