Move gzip and tar filters with other filters.

Remove nbdkit-tar-plugin (replaced with nbdkit-tar-filter), except RHEL 8.
Do not ship nbdkit-S3-plugin on RHEL.

nbdkit.spec

@@ -46,7 +46,7 @@ ExclusiveArch:  x86_64
 
 Name:           nbdkit
 Version:        1.23.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        NBD server
 
 License:        BSD
@@ -316,17 +316,6 @@ This package is a libguestfs plugin for %{name}.
 %endif
 
 
-%package gzip-filter
-Summary:        GZip filter for %{name}
-License:        BSD
-
-Requires:       %{name}-server%{?_isa} = %{version}-%{release}
-
-
-%description gzip-filter
-This package is a gzip filter for %{name}.
-
-
 %if 0%{?rhel} == 8
 %package gzip-plugin
 Summary:        GZip plugin for %{name}
@@ -472,6 +461,7 @@ This package lets you write Ruby plugins for %{name}.
 %endif
 
 
+%if !0%{?rhel}
 # In theory this is noarch, but because plugins are placed in _libdir
 # which varies across architectures, RPM does not allow this.
 %package S3-plugin
@@ -486,6 +476,7 @@ Requires:       python3-boto3
 %description S3-plugin
 This package lets you open disk images stored in Amazon S3
 or Ceph using %{name}.
+%endif
 
 
 %package ssh-plugin
@@ -499,18 +490,7 @@ Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 This package contains SSH support for %{name}.
 
 
-%package tar-filter
+%if 0%{?rhel} == 8
-Summary:        Tar archive filter for %{name}
-License:        BSD
-
-Requires:       %{name}-server%{?_isa} = %{version}-%{release}
-Requires:       tar
-
-
-%description tar-filter
-This package is a tar archive filter for %{name}.
-
-
 %package tar-plugin
 Summary:        Tar archive plugin for %{name}
 License:        BSD
@@ -521,6 +501,7 @@ Requires:       tar
 
 %description tar-plugin
 This package is a tar archive plugin for %{name}.
+%endif
 
 
 %if !0%{?rhel}
@@ -702,6 +683,29 @@ This package contains ext2, ext3 and ext4 filesystem support for
 %endif
 
 
+%package gzip-filter
+Summary:        GZip filter for %{name}
+License:        BSD
+
+Requires:       %{name}-server%{?_isa} = %{version}-%{release}
+
+
+%description gzip-filter
+This package is a gzip filter for %{name}.
+
+
+%package tar-filter
+Summary:        Tar archive filter for %{name}
+License:        BSD
+
+Requires:       %{name}-server%{?_isa} = %{version}-%{release}
+Requires:       tar
+
+
+%description tar-filter
+This package is a tar archive filter for %{name}.
+
+
 %package xz-filter
 Summary:        XZ filter for %{name}
 License:        BSD
@@ -807,6 +811,10 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man3/nbdkit-rust-plugin.3*
 # 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*
+
+# Remove the deprecated tar plugin (use tar filter instead).
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/nbdkit-tar-plugin.so
+rm $RPM_BUILD_ROOT%{_mandir}/man1/nbdkit-tar-plugin.1*
 %endif
 
 %if 0%{?rhel}
@@ -815,6 +823,8 @@ for f in cc cdi torrent; do
     rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/nbdkit-$f-plugin.so
     rm -f $RPM_BUILD_ROOT%{_mandir}/man?/nbdkit-$f-plugin.*
 done
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/nbdkit-S3-plugin
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/nbdkit-S3-plugin.1*
 %endif
 
 
@@ -956,13 +966,6 @@ export LIBGUESTFS_TRACE=1
 %endif
 
 
-%files gzip-filter
-%doc README
-%license LICENSE
-%{_libdir}/%{name}/filters/nbdkit-gzip-filter.so
-%{_mandir}/man1/nbdkit-gzip-filter.1*
-
-
 %if 0%{?rhel} == 8
 %files gzip-plugin
 %doc README
@@ -1052,11 +1055,13 @@ export LIBGUESTFS_TRACE=1
 %endif
 
 
+%if !0%{?rhel}
 %files S3-plugin
 %doc README
 %license LICENSE
 %{_libdir}/%{name}/plugins/nbdkit-S3-plugin
 %{_mandir}/man1/nbdkit-S3-plugin.1*
+%endif
 
 
 %files ssh-plugin
@@ -1066,18 +1071,13 @@ export LIBGUESTFS_TRACE=1
 %{_mandir}/man1/nbdkit-ssh-plugin.1*
 
 
-%files tar-filter
+%if 0%{?rhel} == 8
-%doc README
-%license LICENSE
-%{_libdir}/%{name}/filters/nbdkit-tar-filter.so
-%{_mandir}/man1/nbdkit-tar-filter.1*
-
-
 %files tar-plugin
 %doc README
 %license LICENSE
 %{_libdir}/%{name}/plugins/nbdkit-tar-plugin.so
 %{_mandir}/man1/nbdkit-tar-plugin.1*
+%endif
 
 
 %if !0%{?rhel}
@@ -1188,6 +1188,20 @@ export LIBGUESTFS_TRACE=1
 %endif
 
 
+%files gzip-filter
+%doc README
+%license LICENSE
+%{_libdir}/%{name}/filters/nbdkit-gzip-filter.so
+%{_mandir}/man1/nbdkit-gzip-filter.1*
+
+
+%files tar-filter
+%doc README
+%license LICENSE
+%{_libdir}/%{name}/filters/nbdkit-tar-filter.so
+%{_mandir}/man1/nbdkit-tar-filter.1*
+
+
 %files xz-filter
 %doc README
 %license LICENSE
@@ -1236,6 +1250,11 @@ export LIBGUESTFS_TRACE=1
 
 
 %changelog
+* Thu Dec 03 2020 Richard W.M. Jones <rjones@redhat.com> - 1.23.9-2
+- Move gzip and tar filters with other filters.
+- Remove nbdkit-tar-plugin (replaced with nbdkit-tar-filter), except RHEL 8.
+- Do not ship nbdkit-S3-plugin on RHEL.
+
 * Thu Nov 19 2020 Richard W.M. Jones <rjones@redhat.com> - 1.23.9-1
 - New upstream development version 1.23.9.
 - Add nbdkit-S3-plugin.