Make nbdkit-plugin-tar require nbdkit-plugin-perl.

The tar plugin is written in Perl and so won't work unless the Perl
plugin is also installed.

This dependency should be generated automatically, but for now we add
it manually.

(cherry picked from commit eb867f6953)

nbdkit.spec

@@ -23,10 +23,10 @@
 %global patches_touch_autotools %{nil}
 
 # The source directory.
-%global source_directory 1.5-development
+%global source_directory 1.2-stable
 
 Name:           nbdkit
-Version:        1.5.6
+Version:        1.2.6
 Release:        1%{?dist}
 Summary:        NBD server
 
@@ -65,14 +65,9 @@ BuildRequires:  libvirt-devel
 BuildRequires:  xz-devel
 BuildRequires:  zlib-devel
 BuildRequires:  libcurl-devel
-BuildRequires:  e2fsprogs-devel
-BuildRequires:  bash-completion
 BuildRequires:  perl-devel
 BuildRequires:  perl(ExtUtils::Embed)
 BuildRequires:  python2-devel
-%if 0%{?fedora} >= 29
-BuildRequires:  python-unversioned-command
-%endif
 %if 0%{?have_python3}
 BuildRequires:  python3-devel
 %endif
@@ -82,10 +77,8 @@ BuildRequires:  python3-devel
 BuildRequires:  ocaml >= 4.02.2
 %endif
 BuildRequires:  ruby-devel
-BuildRequires:  tcl-devel
-BuildRequires:  lua-devel
 %if 0%{verify_tarball_signature}
-BuildRequires:  gnupg2
+BuildRequires: gnupg2
 %endif
 
 # Only for running the test suite:
@@ -94,13 +87,6 @@ BuildRequires:  /usr/bin/qemu-img
 BuildRequires:  /usr/bin/socat
 BuildRequires:  /usr/sbin/ss
 
-# nbdkit is a metapackage pulling the server and a useful subset
-# of the plugins and filters.
-Requires:       nbdkit-server
-Requires:       nbdkit-basic-plugins
-Requires:       nbdkit-basic-filters
-
-
 %description
 NBD is a protocol for accessing block devices (hard disks and
 disk-like things) over the network.
@@ -117,29 +103,17 @@ The key features are:
 * Liberal license (BSD) allows nbdkit to be linked to proprietary
   libraries or included in proprietary code.
 
-In Fedora, '%{name}' is a meta-package which pulls in the core server
-and a useful subset of plugins and filters.
+You probably want to install one of more plugins (%{name}-plugin-*).
 
-If you want just the server, install '%{name}-server'.
-
-To develop plugins, install the '%{name}-devel' package and start by
+To develop plugins, install the %{name}-devel package and start by
 reading the nbdkit(1) and nbdkit-plugin(3) manual pages.
 
 
-%package server
-Summary:        The %{name} server
-License:        BSD
-
-
-%description server
-This package contains the %{name} server with no plugins or filters.
-
-
 %package basic-plugins
 Summary:        Basic plugins for %{name}
 License:        BSD
 
-Requires:       %{name}-server%{?_isa} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 # For upgrade path, remove these in Fedora 30.
 Obsoletes:      %{name}-plugin-file < 1.1.19-1
@@ -151,10 +125,6 @@ Obsoletes:      %{name}-plugin-streaming < 1.1.19-1
 This package contains some basic plugins for %{name} which have only
 trivial dependencies.
 
-* nbdkit-data-plugin
-
-  Serve small files directly from the command line.
-
 * nbdkit-file-plugin
 
   A file serving plugin.
@@ -178,14 +148,6 @@ trivial dependencies.
 
   A null (bitbucket) plugin.
 
-* nbdkit-pattern-plugin
-
-  Fixed test pattern.
-
-* nbdkit-random-plugin
-
-  Random content plugin for testing.
-
 * nbdkit-split-plugin
 
   Concatenate one or more files into a single virtual disk.
@@ -194,16 +156,12 @@ trivial dependencies.
 
   A streaming file serving plugin.
 
-* nbdkit-zero-plugin
-
-  Zero-length plugin for testing.
-
 
 %package example-plugins
 Summary:        Example plugins for %{name}
 License:        BSD
 
-Requires:       %{name}-server%{?_isa} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 # For upgrade path, remove this in Fedora 30.
 Obsoletes:      %{name}-plugin-examples < 1.1.19-1
@@ -216,286 +174,169 @@ This package contains example plugins for %{name}.
 # The plugins below have non-trivial dependencies are so are
 # packaged separately.
 
-%package curl-plugin
+%package plugin-curl
 Summary:        HTTP/FTP/SSH (cURL) plugin for %{name}
 License:        BSD
 
-Requires:       %{name}-server%{?_isa} = %{version}-%{release}
-
-# For upgrade path, remove this in Fedora 31.
-Provides:       %{name}-plugin-curl = %{version}-%{release}
-Obsoletes:      %{name}-plugin-curl <= %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 
-%description curl-plugin
+%description plugin-curl
 This package contains cURL (HTTP/FTP/SSH) support for %{name}.
 
 
-%package ext2-plugin
-Summary:        ext2, ext3 and ext4 filesystem support for %{name}
-License:        BSD
-
-Requires:       %{name}-server%{?_isa} = %{version}-%{release}
-
-# For upgrade path, remove this in Fedora 31.
-Provides:       %{name}-plugin-ext2 = %{version}-%{release}
-Obsoletes:      %{name}-plugin-ext2 <= %{version}-%{release}
-
-
-%description ext2-plugin
-This package contains ext2, ext3 and ext4 filesystem support for
-%{name}.
-
-
 %if 0%{?have_libguestfs}
-%package guestfs-plugin
+%package plugin-guestfs
 Summary:        libguestfs plugin for %{name}
 License:        BSD
 
-Requires:       %{name}-server%{?_isa} = %{version}-%{release}
-
-# For upgrade path, remove this in Fedora 31.
-Provides:       %{name}-plugin-guestfs = %{version}-%{release}
-Obsoletes:      %{name}-plugin-guestfs <= %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 
-%description guestfs-plugin
+%description plugin-guestfs
 This package is a libguestfs plugin for %{name}.
 %endif
 
 
-%package gzip-plugin
+%package plugin-gzip
 Summary:        GZip file serving plugin for %{name}
 License:        BSD
 
-Requires:       %{name}-server%{?_isa} = %{version}-%{release}
-
-# For upgrade path, remove this in Fedora 31.
-Provides:       %{name}-plugin-gzip = %{version}-%{release}
-Obsoletes:      %{name}-plugin-gzip <= %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 
-%description gzip-plugin
+%description plugin-gzip
 This package is a gzip file serving plugin for %{name}.
 
 
-%package libvirt-plugin
+%package plugin-libvirt
 Summary:        Libvirt plugin for %{name}
 License:        BSD
 
-Requires:       %{name}-server%{?_isa} = %{version}-%{release}
-
-# For upgrade path, remove this in Fedora 31.
-Provides:       %{name}-plugin-libvirt = %{version}-%{release}
-Obsoletes:      %{name}-plugin-libvirt <= %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 
-%description libvirt-plugin
+%description plugin-libvirt
 This package is a libvirt plugin for %{name}.  It lets you access
 libvirt guest disks readonly.  It is implemented using the libvirt
 virDomainBlockPeek API.
 
 
-%package lua-plugin
-Summary:        Lua plugin for %{name}
-License:        BSD
-
-Requires:       %{name}-server%{?_isa} = %{version}-%{release}
-
-# For upgrade path, remove this in Fedora 31.
-Provides:       %{name}-plugin-lua = %{version}-%{release}
-Obsoletes:      %{name}-plugin-lua <= %{version}-%{release}
-
-
-%description lua-plugin
-This package lets you write Lua plugins for %{name}.
-
-
 %ifarch %{ocaml_native_compiler}
-%package ocaml-plugin
+%package plugin-ocaml
 Summary:        OCaml plugin for %{name}
 License:        BSD
 
-Requires:       %{name}-server%{?_isa} = %{version}-%{release}
-
-# For upgrade path, remove this in Fedora 31.
-Provides:       %{name}-plugin-ocaml = %{version}-%{release}
-Obsoletes:      %{name}-plugin-ocaml <= %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 
-%description ocaml-plugin
+%description plugin-ocaml
 This package lets you run OCaml plugins for %{name}.
 
 To compile OCaml plugins you will also need to install
-%{name}-ocaml-plugin-devel.
+%{name}-plugin-ocaml-devel.
 
 
-%package ocaml-plugin-devel
+%package plugin-ocaml-devel
 Summary:        OCaml development environment for %{name}
 License:        BSD
 
-Requires:       %{name}-server%{?_isa} = %{version}-%{release}
-Requires:       %{name}-ocaml-plugin%{?_isa} = %{version}-%{release}
-
-# For upgrade path, remove this in Fedora 31.
-Provides:       %{name}-plugin-ocaml-devel = %{version}-%{release}
-Obsoletes:      %{name}-plugin-ocaml-devel <= %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name}-plugin-ocaml%{?_isa} = %{version}-%{release}
 
 
-%description ocaml-plugin-devel
+%description plugin-ocaml-devel
 This package lets you write OCaml plugins for %{name}.
 %endif
 
 
-%package perl-plugin
+%package plugin-perl
 Summary:        Perl plugin for %{name}
 License:        BSD
 
-Requires:       %{name}-server%{?_isa} = %{version}-%{release}
-
-# For upgrade path, remove this in Fedora 31.
-Provides:       %{name}-plugin-perl = %{version}-%{release}
-Obsoletes:      %{name}-plugin-perl <= %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 
-%description perl-plugin
+%description plugin-perl
 This package lets you write Perl plugins for %{name}.
 
 
-%package python-plugin-common
+%package plugin-python-common
 Summary:        Python 2 and 3 plugin common files for %{name}
 License:        BSD
 
-Requires:       %{name}-server%{?_isa} = %{version}-%{release}
-
-# For upgrade path, remove this in Fedora 31.
-Provides:       %{name}-plugin-python-common = %{version}-%{release}
-Obsoletes:      %{name}-plugin-python-common <= %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 
-%description python-plugin-common
+%description plugin-python-common
 This package contains common files shared between Python 2
 and Python 3 %{name} plugins.
 
 You should not install this package directly.  Instead install
-either %{name}-python2-plugin or %{name}-python3-plugin.
+either %{name}-plugin-python2 or %{name}-plugin-python3.
 
 
-%package python2-plugin
+%package plugin-python2
 Summary:        Python 2 plugin for %{name}
 License:        BSD
 
-Requires:       %{name}-server%{?_isa} = %{version}-%{release}
-Requires:       %{name}-python-plugin-common = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name}-plugin-python-common = %{version}-%{release}
 
-# For upgrade path, remove this in Fedora 30.
 Provides:       %{name}-plugin-python = %{version}-%{release}
 Obsoletes:      %{name}-plugin-python <= %{version}-%{release}
 
-# For upgrade path, remove this in Fedora 31.
-Provides:       %{name}-plugin-python2 = %{version}-%{release}
-Obsoletes:      %{name}-plugin-python2 <= %{version}-%{release}
 
-
-%description python2-plugin
+%description plugin-python2
 This package lets you write Python 2 plugins for %{name}.
 
 
 %if 0%{?have_python3}
-%package python3-plugin
+%package plugin-python3
 Summary:        Python 3 plugin for %{name}
 License:        BSD
 
-Requires:       %{name}-server%{?_isa} = %{version}-%{release}
-Requires:       %{name}-python-plugin-common = %{version}-%{release}
-
-# For upgrade path, remove this in Fedora 31.
-Provides:       %{name}-plugin-python3 = %{version}-%{release}
-Obsoletes:      %{name}-plugin-python3 <= %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name}-plugin-python-common = %{version}-%{release}
 
 
-%description python3-plugin
+%description plugin-python3
 This package lets you write Python 3 plugins for %{name}.
 %endif
 
 
-%package ruby-plugin
+%package plugin-ruby
 Summary:        Ruby plugin for %{name}
 License:        BSD
 
-Requires:       %{name}-server%{?_isa} = %{version}-%{release}
-
-# For upgrade path, remove this in Fedora 31.
-Provides:       %{name}-plugin-ruby = %{version}-%{release}
-Obsoletes:      %{name}-plugin-ruby <= %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 
-%description ruby-plugin
+%description plugin-ruby
 This package lets you write Ruby plugins for %{name}.
 
 
-%package tar-plugin
+%package plugin-tar
 Summary:        Tar archive plugin for %{name}
 License:        BSD
 
-Requires:       %{name}-server%{?_isa} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 # XXX This dependency should be autogenerated.
-Requires:       %{name}-perl-plugin
-
-# For upgrade path, remove this in Fedora 31.
-Provides:       %{name}-plugin-tar = %{version}-%{release}
-Obsoletes:      %{name}-plugin-tar <= %{version}-%{release}
+Requires:       %{name}-plugin-perl
 
 
-%description tar-plugin
+%description plugin-tar
 This package is a tar archive plugin for %{name}.
 
 
-%package tcl-plugin
-Summary:        Tcl plugin for %{name}
-License:        BSD
-
-Requires:       %{name}-server%{?_isa} = %{version}-%{release}
-
-# For upgrade path, remove this in Fedora 31.
-Provides:       %{name}-plugin-tcl = %{version}-%{release}
-Obsoletes:      %{name}-plugin-tcl <= %{version}-%{release}
-
-
-%description tcl-plugin
-This package lets you write Tcl plugins for %{name}.
-
-
-%ifarch %{ix86} x86_64
-%package vddk-plugin
-Summary:        VMware VDDK plugin for %{name}
-License:        BSD
-
-Requires:       %{name}-server%{?_isa} = %{version}-%{release}
-
-# For upgrade path, remove this in Fedora 31.
-Provides:       %{name}-plugin-vddk = %{version}-%{release}
-Obsoletes:      %{name}-plugin-vddk <= %{version}-%{release}
-
-
-%description vddk-plugin
-This package is a plugin for %{name} which connects to
-VMware VDDK for accessing VMware disks and servers.
-%endif
-
-
-%package xz-plugin
+%package plugin-xz
 Summary:        XZ file serving plugin for %{name}
 License:        BSD
 
-Requires:       %{name}-server%{?_isa} = %{version}-%{release}
-
-# For upgrade path, remove this in Fedora 31.
-Provides:       %{name}-plugin-xz = %{version}-%{release}
-Obsoletes:      %{name}-plugin-xz <= %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 
-%description xz-plugin
+%description plugin-xz
 This package is a xz file serving plugin for %{name}.
 
 
@@ -503,17 +344,13 @@ This package is a xz file serving plugin for %{name}.
 Summary:        Basic filters for %{name}
 License:        BSD
 
-Requires:       %{name}-server%{?_isa} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 
 %description basic-filters
 This package contains some basic filters for %{name} which have only
 trivial dependencies.
 
-* nbdkit-blocksize-filter
-
-  Adjust block size of requests sent to plugins.
-
 * nbdkit-cache-filter
 
   Server-side cache.
@@ -526,22 +363,6 @@ trivial dependencies.
 
   Inject read and write delays.
 
-* nbdkit-error-filter
-
-  Inject errors.
-
-* nbdkit-fua-filter
-
-  Modify flush behaviour in plugins.
-
-* nbdkit-log-filter
-
-  Log all transactions to a file.
-
-* nbdkit-nozero-filter
-
-  Adjust handling of zero requests by plugins.
-
 * nbdkit-offset-filter
 
   Serve an offset and range.
@@ -550,16 +371,12 @@ trivial dependencies.
 
   Serve a single partition.
 
-* nbdkit-truncate-filter
-
-  Truncate, expand, round up or round down a plugin size.
-
 
 %package devel
 Summary:        Development files and documentation for %{name}
 License:        BSD
 
-Requires:       %{name}-server%{?_isa} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig
 
 
@@ -569,18 +386,6 @@ for %{name}.  Install this package if you want to develop
 plugins for %{name}.
 
 
-%package bash-completion
-Summary:       Bash tab-completion for %{name}
-BuildArch:     noarch
-Requires:      bash-completion >= 2.0
-Requires:      %{name}-server = %{version}-%{release}
-
-
-%description bash-completion
-Install this package if you want intelligent bash tab-completion
-for %{name}.
-
-
 %prep
 %if 0%{verify_tarball_signature}
 tmphome="$(mktemp -d)"
@@ -616,7 +421,7 @@ make %{?_smp_mflags}
 %if 0%{?have_python3}
 pushd python3
 export PYTHON=%{_bindir}/python3
-%configure --disable-static --disable-lua --disable-perl --disable-ocaml --disable-ruby --disable-tcl
+%configure --disable-static --disable-perl --disable-ocaml --disable-ruby
 # Verify that it picked the correct version of Python
 # to avoid RHBZ#1404631 happening again silently.
 grep '^PYTHON_VERSION = 3' Makefile
@@ -653,13 +458,6 @@ popd
 # Delete libtool crap.
 find $RPM_BUILD_ROOT -name '*.la' -delete
 
-# Delete the VDDK plugin on !x86 architectures since it is not
-# applicable there.
-%ifnarch %{ix86} x86_64
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/nbdkit-vddk-plugin.so
-rm $RPM_BUILD_ROOT%{_mandir}/man1/nbdkit-vddk-plugin.1*
-%endif
-
 
 %check
 # Workaround for broken libvirt (RHBZ#1138604).
@@ -678,7 +476,7 @@ make check -j1 || {
 %if 0%{?have_libguestfs}
 %if 0%{?have_python3}
 pushd python3
-make check -j1 -C tests TESTS=test-python || {
+make check -j1 TESTS=test-python || {
     cat tests/test-suite.log
     exit 1
   }
@@ -694,10 +492,6 @@ popd
 
 
 %files
-# metapackage so empty
-
-
-%files server
 %doc README
 %license LICENSE
 %{_sbindir}/nbdkit
@@ -705,35 +499,23 @@ popd
 %dir %{_libdir}/%{name}/plugins
 %dir %{_libdir}/%{name}/filters
 %{_mandir}/man1/nbdkit.1*
-%{_mandir}/man1/nbdkit-captive.1*
-%{_mandir}/man1/nbdkit-probing.1*
-%{_mandir}/man1/nbdkit-service.1*
-%{_mandir}/man1/nbdkit-tls.1*
 
 
 %files basic-plugins
 %doc README
 %license LICENSE
-%{_libdir}/%{name}/plugins/nbdkit-data-plugin.so
 %{_libdir}/%{name}/plugins/nbdkit-file-plugin.so
 %{_libdir}/%{name}/plugins/nbdkit-memory-plugin.so
 %{_libdir}/%{name}/plugins/nbdkit-nbd-plugin.so
 %{_libdir}/%{name}/plugins/nbdkit-null-plugin.so
-%{_libdir}/%{name}/plugins/nbdkit-pattern-plugin.so
-%{_libdir}/%{name}/plugins/nbdkit-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-file-plugin.1*
 %{_mandir}/man1/nbdkit-memory-plugin.1*
 %{_mandir}/man1/nbdkit-nbd-plugin.1*
 %{_mandir}/man1/nbdkit-null-plugin.1*
-%{_mandir}/man1/nbdkit-pattern-plugin.1*
-%{_mandir}/man1/nbdkit-random-plugin.1*
 %{_mandir}/man1/nbdkit-split-plugin.1*
 %{_mandir}/man1/nbdkit-streaming-plugin.1*
-%{_mandir}/man1/nbdkit-zero-plugin.1*
 
 
 %files example-plugins
@@ -744,22 +526,15 @@ popd
 %{_mandir}/man1/nbdkit-example*-plugin.1*
 
 
-%files curl-plugin
+%files plugin-curl
 %doc README
 %license LICENSE
 %{_libdir}/%{name}/plugins/nbdkit-curl-plugin.so
 %{_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
+%files plugin-guestfs
 %doc README
 %license LICENSE
 %{_libdir}/%{name}/plugins/nbdkit-guestfs-plugin.so
@@ -767,95 +542,72 @@ popd
 %endif
 
 
-%files gzip-plugin
+%files plugin-gzip
 %doc README
 %license LICENSE
 %{_libdir}/%{name}/plugins/nbdkit-gzip-plugin.so
 %{_mandir}/man1/nbdkit-gzip-plugin.1*
 
 
-%files libvirt-plugin
+%files plugin-libvirt
 %doc README
 %license LICENSE
 %{_libdir}/%{name}/plugins/nbdkit-libvirt-plugin.so
 %{_mandir}/man1/nbdkit-libvirt-plugin.1*
 
 
-%files lua-plugin
-%doc README
-%license LICENSE
-%{_libdir}/%{name}/plugins/nbdkit-lua-plugin.so
-%{_mandir}/man3/nbdkit-lua-plugin.3*
-
-
 %ifarch %{ocaml_native_compiler}
-%files ocaml-plugin
+%files plugin-ocaml
 %doc README
 %license LICENSE
 %{_libdir}/libnbdkitocaml.so.*
 
-%files ocaml-plugin-devel
+%files plugin-ocaml-devel
 %{_libdir}/libnbdkitocaml.so
 %{_libdir}/ocaml/NBDKit.*
 %{_mandir}/man3/nbdkit-ocaml-plugin.3*
 %endif
 
 
-%files perl-plugin
+%files plugin-perl
 %doc README
 %license LICENSE
 %{_libdir}/%{name}/plugins/nbdkit-perl-plugin.so
 %{_mandir}/man3/nbdkit-perl-plugin.3*
 
 
-%files python-plugin-common
+%files plugin-python-common
 %doc README
 %license LICENSE
 %{_mandir}/man3/nbdkit-python-plugin.3*
 
 
-%files python2-plugin
+%files plugin-python2
 %{_libdir}/%{name}/plugins/nbdkit-python-plugin.so
 %{_libdir}/%{name}/plugins/nbdkit-python2-plugin.so
 
 
 %if 0%{?have_python3}
-%files python3-plugin
+%files plugin-python3
 %{_libdir}/%{name}/plugins/nbdkit-python3-plugin.so
 %endif
 
 
-%files ruby-plugin
+%files plugin-ruby
 %doc README
 %license LICENSE
 %{_libdir}/%{name}/plugins/nbdkit-ruby-plugin.so
 %{_mandir}/man3/nbdkit-ruby-plugin.3*
 
 
-%files tar-plugin
+%files plugin-tar
 %doc README
 %license LICENSE
 %{_libdir}/%{name}/plugins/nbdkit-tar-plugin
 %{_mandir}/man1/nbdkit-tar-plugin.1*
 
 
-%files tcl-plugin
-%doc README
-%license LICENSE
-%{_libdir}/%{name}/plugins/nbdkit-tcl-plugin.so
-%{_mandir}/man3/nbdkit-tcl-plugin.3*
-
-
-%ifarch %{ix86} x86_64
-%files vddk-plugin
-%doc README
-%license LICENSE
-%{_libdir}/%{name}/plugins/nbdkit-vddk-plugin.so
-%{_mandir}/man1/nbdkit-vddk-plugin.1*
-%endif
-
-
-%files xz-plugin
+%files plugin-xz
 %doc README
 %license LICENSE
 %{_libdir}/%{name}/plugins/nbdkit-xz-plugin.so
@@ -865,28 +617,16 @@ popd
 %files basic-filters
 %doc README
 %license LICENSE
-%{_libdir}/%{name}/filters/nbdkit-blocksize-filter.so
 %{_libdir}/%{name}/filters/nbdkit-cache-filter.so
 %{_libdir}/%{name}/filters/nbdkit-cow-filter.so
 %{_libdir}/%{name}/filters/nbdkit-delay-filter.so
-%{_libdir}/%{name}/filters/nbdkit-error-filter.so
-%{_libdir}/%{name}/filters/nbdkit-fua-filter.so
-%{_libdir}/%{name}/filters/nbdkit-log-filter.so
-%{_libdir}/%{name}/filters/nbdkit-nozero-filter.so
 %{_libdir}/%{name}/filters/nbdkit-offset-filter.so
 %{_libdir}/%{name}/filters/nbdkit-partition-filter.so
-%{_libdir}/%{name}/filters/nbdkit-truncate-filter.so
-%{_mandir}/man1/nbdkit-blocksize-filter.1*
 %{_mandir}/man1/nbdkit-cache-filter.1*
 %{_mandir}/man1/nbdkit-cow-filter.1*
 %{_mandir}/man1/nbdkit-delay-filter.1*
-%{_mandir}/man1/nbdkit-error-filter.1*
-%{_mandir}/man1/nbdkit-fua-filter.1*
-%{_mandir}/man1/nbdkit-log-filter.1*
-%{_mandir}/man1/nbdkit-nozero-filter.1*
 %{_mandir}/man1/nbdkit-offset-filter.1*
 %{_mandir}/man1/nbdkit-partition-filter.1*
-%{_mandir}/man1/nbdkit-truncate-filter.1*
 
 
 %files devel
@@ -895,11 +635,9 @@ popd
 # Include the source of the example plugins in the documentation.
 %doc plugins/example*/*.c
 %doc plugins/example4/nbdkit-example4-plugin
-%doc plugins/lua/example.lua
 %doc plugins/perl/example.pl
 %doc plugins/python/example.py
 %doc plugins/ruby/example.rb
-%doc plugins/tcl/example.tcl
 %{_includedir}/nbdkit-common.h
 %{_includedir}/nbdkit-filter.h
 %{_includedir}/nbdkit-plugin.h
@@ -908,100 +646,39 @@ popd
 %{_libdir}/pkgconfig/nbdkit.pc
 
 
-%files bash-completion
-%license LICENSE
-%dir %{_datadir}/bash-completion/completions
-%{_datadir}/bash-completion/completions/nbdkit
-
-
 %changelog
-* Thu Aug 16 2018 Richard W.M. Jones <rjones@redhat.com> - 1.5.6-1
-- New upstream version 1.5.6.
+* Wed Aug  1 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.6-1
+- New upstream version 1.2.6.
 
-* Tue Aug 14 2018 Richard W.M. Jones <rjones@redhat.com> - 1.5.5-2
-- Make nbdkit a metapackage.
-- Package server in nbdkit-server subpackage.
-- Rename all nbdkit-plugin-FOO to nbdkit-FOO-plugin to match upstream.
-
-* Mon Aug 13 2018 Richard W.M. Jones <rjones@redhat.com> - 1.5.5-1
-- New upstream version 1.5.5.
-- New plugin: data.
-
-* Mon Aug  6 2018 Richard W.M. Jones <rjones@redhat.com> - 1.5.4-1
-- New upstream version 1.5.4.
-- Add topic man pages.
-
-* Mon Aug  6 2018 Richard W.M. Jones <rjones@redhat.com> - 1.5.3-1
-- New upstream version 1.5.3.
-- New filter: error.
-
-* Wed Aug  1 2018 Richard W.M. Jones <rjones@redhat.com> - 1.5.2-1
-- New upstream version 1.5.2.
-- Remove patches which are all upstream.
-- New filter: truncate.
-
-* Tue Jul 24 2018 Richard W.M. Jones <rjones@redhat.com> - 1.5.1-2
-- Enable VDDK plugin on x86-64 only.
-
-* Fri Jul 20 2018 Richard W.M. Jones <rjones@redhat.com> - 1.5.1-1
-- New upstream version 1.5.1.
-- Remove patches, all upstream in this version.
+* Wed Jul 25 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.5-1
+- New stable version 1.2.5.
 - Small refactorings in the spec file.
 
-* Sun Jul 15 2018 Richard W.M. Jones <rjones@redhat.com> - 1.5.0-3
-- Add all upstream patches since 1.5.0.
-- New pattern plugin.
-- Add fixes for 32 bit platforms i686 and armv7.
+* Sun Jul  1 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.4-3
+- Add all upstream patches since 1.2.4 was released.
 
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+* Tue Jun 12 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.4-2
+- Add all upstream patches since 1.2.4 was released.
 
-* Sat Jul  7 2018 Richard W.M. Jones <rjones@redhat.com> - 1.5.0-1
-- New upstream version 1.5.0.
-- Add Lua plugin and nbdkit-plugin-lua subpackage.
-- Make python-unversioned-command dependent on Fedora >= 29.
-
-* Fri Jul  6 2018 Richard W.M. Jones <rjones@redhat.com> - 1.4.0-1
-- New upstream version 1.4.0.
-- Add nbdkit-plugin-tcl subpackage.
-- +BR python-unversioned-command
-
-* Tue Jul 03 2018 Petr Pisar <ppisar@redhat.com> - 1.3.4-4
-- Perl 5.28 rebuild
-
-* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 1.3.4-3
-- Rebuilt for Python 3.7
-
-* Wed Jun 27 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1.3.4-2
-- Perl 5.28 rebuild
-
-* Sat Jun 23 2018 Richard W.M. Jones <rjones@redhat.com> - 1.3.4-1
-- New upstream version 1.3.4.
-
-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1.3.3-2
-- Rebuilt for Python 3.7
-
-* Mon Jun 11 2018 Richard W.M. Jones <rjones@redhat.com> - 1.3.3-1
-- New upstream version 1.3.3.
-- New plugins: nbdkit-zero-plugin, nbdkit-random-plugin.
+* Sat Jun  9 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.4-1
+- New stable version 1.2.4.
 - Remove upstream patches.
-
-* Sat Jun  9 2018 Richard W.M. Jones <rjones@redhat.com> - 1.3.2-2
-- New upstream version 1.3.2.
-- Remove patches now upstream.
-- New ext2 plugin and subpackage, requires e2fsprogs-devel to build.
 - Enable tarball signatures.
 - Add upstream patch to fix tests when guestfish not available.
-- Enable bash tab completion.
 
-* Wed Jun  6 2018 Richard W.M. Jones <rjones@redhat.com> - 1.3.1-1
-- New upstream version 1.3.1.
+* Wed Jun  6 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-1
+- New stable version 1.2.3.
 - Add patch to work around libvirt problem with relative socket paths.
 - Add patch to fix the xz plugin test with recent guestfish.
 
-* Fri Apr  6 2018 Richard W.M. Jones <rjones@redhat.com> - 1.3.0-1
-- Move to development branch version 1.3.0.
-- New filters: blocksize, fua, log, nozero.
+* Sat Apr 21 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.2-1
+- New stable version 1.2.2.
+
+* Mon Apr  9 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.1-1
+- New stable version 1.2.1.
+
+* Fri Apr  6 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-1
+- Move to stable branch version 1.2.0.
 
 * Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.1.28-5
 - Escape macros in %%changelog

sources

@@ -1,2 +1,2 @@
-SHA512 (nbdkit-1.5.6.tar.gz) = bacdc95b909e943e6476f24d10e7e9e2ea0b9e26362c35c604c8e1cdf361e333e47c38747b491077e9444466e014fe9f67c6db8be3a98f1f0e7bffee555c1bc0
-SHA512 (nbdkit-1.5.6.tar.gz.sig) = 96917b05005adba7333073b4ba91b3b499f76c418833344cda5a93603a84bc78421749f5ed13432323216f0b1195bf0bbebd63ba4959390568b7a4289a69d0db
+SHA512 (nbdkit-1.2.6.tar.gz) = 0eb171bb1f8f0bda9b424605512e90f16a30b2a11ae980c600c32309c667a99cedcd974adbd80c85fbf298f0b44b49974bade8164c0035fd8c96cd6e352d9421
+SHA512 (nbdkit-1.2.6.tar.gz.sig) = f69df2c4656d9c3ca12b0a487631ef4a7978d5168d1fb0da3bb95856846e1d9672902c5ee175c42a1f16d344586507a4fbe8c3d8b9b683c5e31c1ace9b941e4f