From 8c5dfe0e046b2a79e7b37d15e9c33e4c86adc423 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 11 Jul 2020 22:21:14 +0100
Subject: [PATCH] New upstream development version 1.21.17. New
 nbdkit-gzip-filter. Remove deprecated nbdkit-gzip-plugin.

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

diff --git a/nbdkit.spec b/nbdkit.spec
index 8407d27..c44aadc 100644
--- a/nbdkit.spec
+++ b/nbdkit.spec
@@ -44,7 +44,7 @@ ExclusiveArch:  x86_64
 %global source_directory 1.21-development
 
 Name:           nbdkit
-Version:        1.21.16
+Version:        1.21.17
 Release:        1%{?dist}
 Summary:        NBD server
 
@@ -267,15 +267,15 @@ This package is a libguestfs plugin for %{name}.
 %endif
 
 
-%package gzip-plugin
-Summary:        GZip file serving plugin for %{name}
+%package gzip-filter
+Summary:        GZip filter for %{name}
 License:        BSD
 
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 
-%description gzip-plugin
-This package is a gzip file serving plugin for %{name}.
+%description gzip-filter
+This package is a gzip filter for %{name}.
 
 
 %package iso-plugin
@@ -684,6 +684,10 @@ make %{?_smp_mflags}
 # Delete libtool crap.
 find $RPM_BUILD_ROOT -name '*.la' -delete
 
+# Remove the deprecated gzip plugin (use gzip filter instead).
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/nbdkit-gzip-plugin.so
+rm $RPM_BUILD_ROOT%{_mandir}/man1/nbdkit-gzip-plugin.1*
+
 
 %check
 %ifnarch %{broken_test_arches}
@@ -807,11 +811,11 @@ make %{?_smp_mflags} check || {
 %endif
 
 
-%files gzip-plugin
+%files gzip-filter
 %doc README
 %license LICENSE
-%{_libdir}/%{name}/plugins/nbdkit-gzip-plugin.so
-%{_mandir}/man1/nbdkit-gzip-plugin.1*
+%{_libdir}/%{name}/filters/nbdkit-gzip-filter.so
+%{_mandir}/man1/nbdkit-gzip-filter.1*
 
 
 %files iso-plugin
@@ -1040,6 +1044,11 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
+* Sat Jul 11 2020 Richard W.M. Jones <rjones@redhat.com> - 1.21.17-1
+- New upstream development version 1.21.17.
+- New nbdkit-gzip-filter.
+- Remove deprecated nbdkit-gzip-plugin.
+
 * Thu Jul  9 2020 Richard W.M. Jones <rjones@redhat.com> - 1.21.16-1
 - New upstream development version 1.21.16.
 - New nbdkit-tar-filter.
diff --git a/sources b/sources
index 5b012bc..d5878c3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (nbdkit-1.21.16.tar.gz) = 09e0154ba7754db9a2c6242f06a35b8e0e096acdf1ec68da2cdc3cb3ad3a44f3d7538802b22db80dbacb72f5fe79ee5bc241d0547e6c6d60b57f464fe128f93f
-SHA512 (nbdkit-1.21.16.tar.gz.sig) = c2e4dc967b062ac4b8e0221fabe4dad3bb3a1915b0e4d4f4f0011d0edfbf23f079f294cac0432501b9888b0640d5efb6ca8ac868c68663462e3ec3c82970d8d2
+SHA512 (nbdkit-1.21.17.tar.gz) = 7b9af0a6fbcb0021ee8461d3d741653709cb6d56b2e1305d8e96a7017ad7578cd61a26f4dd4f41f31e5672fad349f2beff3ad7e7c0d749f25043600974022a95
+SHA512 (nbdkit-1.21.17.tar.gz.sig) = 51ad4f8d5994f2f309ed0ed82912ccb2b248985572cb2a9bff543bc8030b4b8b4dfb0310551d83e4f385a45695e913e0bd9be9b6b889f59beb1eacc4672e2948