New upstream development version 1.25.2.

Remove all remaining traces of nbdkit-gzip-plugin and nbdkit-tar-plugin.
Remove nbdkit-streaming-plugin (deprecated upstream).
Remove obsoletes of old nbdkit-ext2-plugin.
This commit is contained in:
Richard W.M. Jones 2021-02-03 22:37:24 +00:00
parent 54e2732c58
commit aef3b97d93
2 changed files with 11 additions and 69 deletions

View File

@ -45,8 +45,8 @@ ExclusiveArch: x86_64
%global source_directory 1.25-development %global source_directory 1.25-development
Name: nbdkit Name: nbdkit
Version: 1.25.1 Version: 1.25.2
Release: 2%{?dist} Release: 1%{?dist}
Summary: NBD server Summary: NBD server
License: BSD License: BSD
@ -207,7 +207,6 @@ Provides: %{name}-random-plugin = %{version}-%{release}
Provides: %{name}-sh-plugin = %{version}-%{release} Provides: %{name}-sh-plugin = %{version}-%{release}
Provides: %{name}-sparse-random-plugin = %{version}-%{release} Provides: %{name}-sparse-random-plugin = %{version}-%{release}
Provides: %{name}-split-plugin = %{version}-%{release} Provides: %{name}-split-plugin = %{version}-%{release}
Provides: %{name}-streaming-plugin = %{version}-%{release}
Provides: %{name}-zero-plugin = %{version}-%{release} Provides: %{name}-zero-plugin = %{version}-%{release}
@ -246,8 +245,6 @@ nbdkit-sparse-random-plugin Make sparse random disks.
nbdkit-split-plugin Concatenate one or more files. nbdkit-split-plugin Concatenate one or more files.
nbdkit-streaming-plugin A streaming file serving plugin.
nbdkit-zero-plugin Zero-length plugin for testing. nbdkit-zero-plugin Zero-length plugin for testing.
@ -325,19 +322,6 @@ This package is a libguestfs plugin for %{name}.
%endif %endif
%if 0%{?rhel} == 8
%package gzip-plugin
Summary: GZip plugin for %{name}
License: BSD
Requires: %{name}-server%{?_isa} = %{version}-%{release}
%description gzip-plugin
This package is a gzip plugin for %{name}.
%endif
%if !0%{?rhel} %if !0%{?rhel}
%package iso-plugin %package iso-plugin
Summary: Virtual ISO 9660 plugin for %{name} Summary: Virtual ISO 9660 plugin for %{name}
@ -499,20 +483,6 @@ Requires: %{name}-server%{?_isa} = %{version}-%{release}
This package contains SSH support for %{name}. This package contains SSH support for %{name}.
%if 0%{?rhel} == 8
%package tar-plugin
Summary: Tar archive plugin for %{name}
License: BSD
Requires: %{name}-server%{?_isa} = %{version}-%{release}
Requires: tar
%description tar-plugin
This package is a tar archive plugin for %{name}.
%endif
%if !0%{?rhel} %if !0%{?rhel}
%package tcl-plugin %package tcl-plugin
Summary: Tcl plugin for %{name} Summary: Tcl plugin for %{name}
@ -684,10 +654,6 @@ License: BSD
Requires: %{name}-server%{?_isa} = %{version}-%{release} 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 %description ext2-filter
This package contains ext2, ext3 and ext4 filesystem support for This package contains ext2, ext3 and ext4 filesystem support for
@ -822,19 +788,9 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
# rust plugin is built. Delete it if this happens. # rust plugin is built. Delete it if this happens.
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/nbdkit-rust-plugin.3* rm -f $RPM_BUILD_ROOT%{_mandir}/man3/nbdkit-rust-plugin.3*
%if 0%{?rhel} != 8
# 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} %if 0%{?rhel}
# In RHEL, remove some plugins we cannot --disable. # In RHEL, remove some plugins we cannot --disable.
for f in cc cdi torrent; do for f in cc cdi streaming torrent; do
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/nbdkit-$f-plugin.so rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/nbdkit-$f-plugin.so
rm -f $RPM_BUILD_ROOT%{_mandir}/man?/nbdkit-$f-plugin.* rm -f $RPM_BUILD_ROOT%{_mandir}/man?/nbdkit-$f-plugin.*
done done
@ -918,7 +874,6 @@ export LIBGUESTFS_TRACE=1
%{_libdir}/%{name}/plugins/nbdkit-sh-plugin.so %{_libdir}/%{name}/plugins/nbdkit-sh-plugin.so
%{_libdir}/%{name}/plugins/nbdkit-sparse-random-plugin.so %{_libdir}/%{name}/plugins/nbdkit-sparse-random-plugin.so
%{_libdir}/%{name}/plugins/nbdkit-split-plugin.so %{_libdir}/%{name}/plugins/nbdkit-split-plugin.so
%{_libdir}/%{name}/plugins/nbdkit-streaming-plugin.so
%{_libdir}/%{name}/plugins/nbdkit-zero-plugin.so %{_libdir}/%{name}/plugins/nbdkit-zero-plugin.so
%{_mandir}/man1/nbdkit-data-plugin.1* %{_mandir}/man1/nbdkit-data-plugin.1*
%{_mandir}/man1/nbdkit-eval-plugin.1* %{_mandir}/man1/nbdkit-eval-plugin.1*
@ -935,7 +890,6 @@ export LIBGUESTFS_TRACE=1
%{_mandir}/man3/nbdkit-sh-plugin.3* %{_mandir}/man3/nbdkit-sh-plugin.3*
%{_mandir}/man1/nbdkit-sparse-random-plugin.1* %{_mandir}/man1/nbdkit-sparse-random-plugin.1*
%{_mandir}/man1/nbdkit-split-plugin.1* %{_mandir}/man1/nbdkit-split-plugin.1*
%{_mandir}/man1/nbdkit-streaming-plugin.1*
%{_mandir}/man1/nbdkit-zero-plugin.1* %{_mandir}/man1/nbdkit-zero-plugin.1*
@ -983,15 +937,6 @@ export LIBGUESTFS_TRACE=1
%endif %endif
%if 0%{?rhel} == 8
%files gzip-plugin
%doc README
%license LICENSE
%{_libdir}/%{name}/plugins/nbdkit-gzip-plugin.so
%{_mandir}/man1/nbdkit-gzip-plugin.1*
%endif
%if !0%{?rhel} %if !0%{?rhel}
%files iso-plugin %files iso-plugin
%doc README %doc README
@ -1088,15 +1033,6 @@ export LIBGUESTFS_TRACE=1
%{_mandir}/man1/nbdkit-ssh-plugin.1* %{_mandir}/man1/nbdkit-ssh-plugin.1*
%if 0%{?rhel} == 8
%files tar-plugin
%doc README
%license LICENSE
%{_libdir}/%{name}/plugins/nbdkit-tar-plugin.so
%{_mandir}/man1/nbdkit-tar-plugin.1*
%endif
%if !0%{?rhel} %if !0%{?rhel}
%files tcl-plugin %files tcl-plugin
%doc README %doc README
@ -1269,6 +1205,12 @@ export LIBGUESTFS_TRACE=1
%changelog %changelog
* Wed Feb 03 2021 Richard W.M. Jones <rjones@redhat.com> - 1.25.2-1
- New upstream development version 1.25.2.
- Remove all remaining traces of nbdkit-gzip-plugin and nbdkit-tar-plugin.
- Remove nbdkit-streaming-plugin (deprecated upstream).
- Remove obsoletes of old nbdkit-ext2-plugin.
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.25.1-2 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.25.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

View File

@ -1,2 +1,2 @@
SHA512 (nbdkit-1.25.1.tar.gz) = 72b18c3be56240aeda4087ce3ebf7addf7a37ca4a063f39775b93dd89b9aefd196423a5912f581cf9f5ea774fca6e2159b2490d638260c4781627f5128e98031 SHA512 (nbdkit-1.25.2.tar.gz) = 1b0e55cbe3d043a6dc16e3d5291d1eca01b2c93ea3b8ff4a2e8bcdf65d39f4997c816386981d7cc2f8a052c641b92129aa6963361e1c21358618fcd274553b29
SHA512 (nbdkit-1.25.1.tar.gz.sig) = ef24fe7a4cd353f2646829615a99532060429ffd93e41aba3b59a3d4d7a6335c6c47254fb4b43192cd974e72c4c2248b644c6c254ed1323787db3f781620e734 SHA512 (nbdkit-1.25.2.tar.gz.sig) = 55866ea439409e64e1ff1bab82a69c78ad088690632cf27b5f9d4f8759256deb26ef932c68dcd8fa551cd7e2a0eaaf4223ce56b663d34e4015dfa0328b6270e1