From b1707f1bcb391fe8e7bbbbccbc463d0c4bf578d7 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Tue, 9 Feb 2021 02:29:31 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/nbdkit.git#13b6512f5ee3e4868f31b0047aca523de9c7423e --- nbdkit.spec | 90 ++++++++++++++--------------------------------------- sources | 4 +-- 2 files changed, 26 insertions(+), 68 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 94948b7..d3a63f9 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -42,11 +42,11 @@ ExclusiveArch: x86_64 %global patches_touch_autotools 1 # The source directory. -%global source_directory 1.24-stable +%global source_directory 1.25-development Name: nbdkit -Version: 1.24.0 -Release: 2%{?dist} +Version: 1.25.2 +Release: 1%{?dist} Summary: NBD server License: BSD @@ -67,6 +67,7 @@ Source2: libguestfs.keyring # Maintainer script which helps with handling patches. Source3: copy-patches.sh +BuildRequires: make %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool %endif @@ -206,7 +207,6 @@ Provides: %{name}-random-plugin = %{version}-%{release} Provides: %{name}-sh-plugin = %{version}-%{release} Provides: %{name}-sparse-random-plugin = %{version}-%{release} Provides: %{name}-split-plugin = %{version}-%{release} -Provides: %{name}-streaming-plugin = %{version}-%{release} Provides: %{name}-zero-plugin = %{version}-%{release} @@ -245,8 +245,6 @@ nbdkit-sparse-random-plugin Make sparse random disks. nbdkit-split-plugin Concatenate one or more files. -nbdkit-streaming-plugin A streaming file serving plugin. - nbdkit-zero-plugin Zero-length plugin for testing. @@ -324,19 +322,6 @@ This package is a libguestfs plugin for %{name}. %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} %package iso-plugin Summary: Virtual ISO 9660 plugin for %{name} @@ -498,20 +483,6 @@ Requires: %{name}-server%{?_isa} = %{version}-%{release} 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} %package tcl-plugin Summary: Tcl plugin for %{name} @@ -683,10 +654,6 @@ 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 @@ -712,6 +679,8 @@ License: BSD Requires: %{name}-server%{?_isa} = %{version}-%{release} Requires: tar +Obsoletes: %{name}-tar-plugin < 1.23.9-3 + %description tar-filter This package is a tar archive filter for %{name}. @@ -819,15 +788,9 @@ 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* -%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 +# Remove the streaming plugin (deprecated upstream). +rm $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/nbdkit-streaming-plugin.so +rm $RPM_BUILD_ROOT%{_mandir}/man1/nbdkit-streaming-plugin.1* %if 0%{?rhel} # In RHEL, remove some plugins we cannot --disable. @@ -915,7 +878,6 @@ export LIBGUESTFS_TRACE=1 %{_libdir}/%{name}/plugins/nbdkit-sh-plugin.so %{_libdir}/%{name}/plugins/nbdkit-sparse-random-plugin.so %{_libdir}/%{name}/plugins/nbdkit-split-plugin.so -%{_libdir}/%{name}/plugins/nbdkit-streaming-plugin.so %{_libdir}/%{name}/plugins/nbdkit-zero-plugin.so %{_mandir}/man1/nbdkit-data-plugin.1* %{_mandir}/man1/nbdkit-eval-plugin.1* @@ -932,7 +894,6 @@ export LIBGUESTFS_TRACE=1 %{_mandir}/man3/nbdkit-sh-plugin.3* %{_mandir}/man1/nbdkit-sparse-random-plugin.1* %{_mandir}/man1/nbdkit-split-plugin.1* -%{_mandir}/man1/nbdkit-streaming-plugin.1* %{_mandir}/man1/nbdkit-zero-plugin.1* @@ -980,15 +941,6 @@ export LIBGUESTFS_TRACE=1 %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} %files iso-plugin %doc README @@ -1085,15 +1037,6 @@ export LIBGUESTFS_TRACE=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} %files tcl-plugin %doc README @@ -1266,6 +1209,21 @@ export LIBGUESTFS_TRACE=1 %changelog +* Wed Feb 03 2021 Richard W.M. Jones - 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 - 1.25.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jan 20 2021 Richard W.M. Jones - 1.25.1-1 +- New upstream development version 1.25.1. + +* Tue Jan 19 2021 Richard W.M. Jones - 1.24.0-3 +- Obsolete nbdkit-tar-plugin to provide smooth upgrades to F33+. + * Fri Jan 08 2021 Mamoru TASAKA - 1.24.0-2 - F-34: rebuild against ruby 3.0 diff --git a/sources b/sources index bffaaa7..7a2926b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.24.0.tar.gz) = cef2976163856b0c46148f9953764ed9ddf59fd2644380375ab34b7a10e981c3bebf892b63771b20a4a34f6ffb59d80f46204a38aa9fd0cd9fef82ff098b35d8 -SHA512 (nbdkit-1.24.0.tar.gz.sig) = 71888a984f3dcb73b87903a9e56bf5a6c6f8114907cb092185e0e3d44ce0406ae62e9671de87fd000f72f73fe732f23c69cdbb2eafa496884846a39fc70f90fa +SHA512 (nbdkit-1.25.2.tar.gz) = 1b0e55cbe3d043a6dc16e3d5291d1eca01b2c93ea3b8ff4a2e8bcdf65d39f4997c816386981d7cc2f8a052c641b92129aa6963361e1c21358618fcd274553b29 +SHA512 (nbdkit-1.25.2.tar.gz.sig) = 55866ea439409e64e1ff1bab82a69c78ad088690632cf27b5f9d4f8759256deb26ef932c68dcd8fa551cd7e2a0eaaf4223ce56b663d34e4015dfa0328b6270e1