From 7c331b388ba4589c2d81d446d7b64590496883af Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 12 Feb 2020 16:39:23 +0000
Subject: [PATCH] New upstream development version 1.17.8. New filter: ext2.
 Deprecate and remove ext2 plugin.

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

diff --git a/nbdkit.spec b/nbdkit.spec
index 33e0859..aeb63e5 100644
--- a/nbdkit.spec
+++ b/nbdkit.spec
@@ -37,8 +37,8 @@ ExclusiveArch:  x86_64
 %global source_directory 1.17-development
 
 Name:           nbdkit
-Version:        1.17.7
-Release:        2%{?dist}
+Version:        1.17.8
+Release:        1%{?dist}
 Summary:        NBD server
 
 License:        BSD
@@ -226,18 +226,6 @@ Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 This package contains cURL (HTTP/FTP) support for %{name}.
 
 
-%package ext2-plugin
-Summary:        ext2, ext3 and ext4 filesystem support for %{name}
-License:        BSD
-
-Requires:       %{name}-server%{?_isa} = %{version}-%{release}
-
-
-%description ext2-plugin
-This package contains ext2, ext3 and ext4 filesystem support for
-%{name}.
-
-
 %if 0%{?have_libguestfs}
 %package guestfs-plugin
 Summary:        libguestfs plugin for %{name}
@@ -517,6 +505,22 @@ nbdkit-stats-filter        Display statistics about operations.
 nbdkit-truncate-filter     Truncate, expand, round up or round down size.
 
 
+%package ext2-filter
+Summary:        ext2, ext3 and ext4 filesystem support for %{name}
+License:        BSD
+
+Requires:       %{name}-server%{?_isa} = %{version}-%{release}
+
+# Remove in Fedora 34:
+Provides:       %{name}-ext2-plugin = %{version}-%{release}
+Obsoletes:      %{name}-ext2-plugin <= %{version}-%{release}
+
+
+%description ext2-filter
+This package contains ext2, ext3 and ext4 filesystem support for
+%{name}.
+
+
 %package xz-filter
 Summary:        XZ filter for %{name}
 License:        BSD
@@ -608,6 +612,10 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
 # rust plugin is built.  Delete it if this happens.
 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/nbdkit-rust-plugin.3*
 
+# Remove the deprecated ext2 plugin (use ext2 filter instead).
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/nbdkit-ext2-plugin.so
+rm $RPM_BUILD_ROOT%{_mandir}/man1/nbdkit-ext2-plugin.1*
+
 
 %check
 # Workaround for broken libvirt (RHBZ#1138604).
@@ -713,13 +721,6 @@ make %{?_smp_mflags} check || {
 %{_mandir}/man1/nbdkit-curl-plugin.1*
 
 
-%files ext2-plugin
-%doc README
-%license LICENSE
-%{_libdir}/%{name}/plugins/nbdkit-ext2-plugin.so
-%{_mandir}/man1/nbdkit-ext2-plugin.1*
-
-
 %if 0%{?have_libguestfs}
 %files guestfs-plugin
 %doc README
@@ -884,6 +885,13 @@ make %{?_smp_mflags} check || {
 %{_mandir}/man1/nbdkit-truncate-filter.1*
 
 
+%files ext2-filter
+%doc README
+%license LICENSE
+%{_libdir}/%{name}/filters/nbdkit-ext2-filter.so
+%{_mandir}/man1/nbdkit-ext2-filter.1*
+
+
 %files xz-filter
 %doc README
 %license LICENSE
@@ -924,14 +932,19 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
+* Wed Feb 12 2020 Richard W.M. Jones <rjones@redhat.com> - 1.17.8-1
+- New upstream development version 1.17.8.
+- New filter: ext2.
+- Deprecate and remove ext2 plugin.
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
-* Sat Jan 25 2019 Richard W.M. Jones <rjones@redhat.com> - 1.17.7-1
+* Sat Jan 25 2020 Richard W.M. Jones <rjones@redhat.com> - 1.17.7-1
 - New upstream development version 1.17.7.
 - New filter: extentlist.
 
-* Tue Jan 21 2019 Richard W.M. Jones <rjones@redhat.com> - 1.17.6-1
+* Tue Jan 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.17.6-1
 - New upstream development version 1.17.6.
 
 * Sun Dec 15 2019 Richard W.M. Jones <rjones@redhat.com> - 1.17.5-1
diff --git a/sources b/sources
index cd20a2d..055ed0b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (nbdkit-1.17.7.tar.gz) = 0230c59804ae5d1b68a3bdf35e574a86747dfabc071f01d0eb556a99b968aa9fd6b17fd624a5b67bddfb44d6cd01915cae9db107616ca20bd6f38760de11d7f6
-SHA512 (nbdkit-1.17.7.tar.gz.sig) = 3faae8509870c479289ffe4d3fed7f2da9e07a1e1c6de03f692d72ebcfe0e0331282983fc1baeebb9b73121db85986bd1d9691bd4c6cb919bac07fc5e1d8ca22
+SHA512 (nbdkit-1.17.8.tar.gz) = a7f545753f930daf7a03feb1f6caaff75fd231a3a848c67989da464bb1de029eab00155a74f0455c754add9933189b35a565a6abd6db294e3bdd47d7b1895ef5
+SHA512 (nbdkit-1.17.8.tar.gz.sig) = 22bdc248e7bcf7b303c8997dbd0a603f077c7a48e7f8590c3b213c7fb092b1701d6bbe1523302ee7be1378e73cd08c17ca0b6873c0e1d72ebd5f4c55c04ef1e4