New upstream version 1.5.6.

Package server in nbdkit-server subpackage.
Rename all nbdkit-plugin-FOO to nbdkit-FOO-plugin to match upstream.

.gitignore

@@ -1,2 +1,3 @@
 /clog
 /nbdkit-*.tar.gz
+/nbdkit-*.tar.gz.sig

nbdkit.spec

@@ -9,22 +9,40 @@
 # On all other architectures, a simpler test suite must pass.  This
 # omits any tests that run full qemu, since running qemu under TCG is
 # often broken on non-x86_64 arches.
-%global complete_test_arches aarch64 x86_64
+%global complete_test_arches x86_64
 
 # Currently everything has Python 2.  RHEL 7 doesn't have Python 3.
 %if 0%{?rhel} != 7
 %global have_python3 1
 %endif
 
+# If we should verify tarball signature with GPGv2.
+%global verify_tarball_signature 1
+
+# If there are patches which touch autotools files, set this to 1.
+%global patches_touch_autotools %{nil}
+
+# The source directory.
+%global source_directory 1.5-development
+
 Name:           nbdkit
-Version:        1.1.28
-Release:        5%{?dist}
+Version:        1.5.6
+Release:        1%{?dist}
 Summary:        NBD server
 
 License:        BSD
 URL:            https://github.com/libguestfs/nbdkit
 
-Source0:        http://libguestfs.org/download/nbdkit/%{name}-%{version}.tar.gz
+Source0:        http://libguestfs.org/download/nbdkit/%{source_directory}/%{name}-%{version}.tar.gz
+%if 0%{verify_tarball_signature}
+Source1:        http://libguestfs.org/download/nbdkit/%{source_directory}/%{name}-%{version}.tar.gz.sig
+# Keyring used to verify tarball signature.
+Source2:       libguestfs.keyring
+%endif
+
+%if 0%{patches_touch_autotools}
+BuildRequires: autoconf, automake, libtool
+%endif
 
 %if 0%{?rhel} == 7
 # On RHEL 7, nothing in the virt stack is shipped on aarch64 and
@@ -47,9 +65,14 @@ 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
@@ -59,6 +82,11 @@ 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
+%endif
 
 # Only for running the test suite:
 BuildRequires:  /usr/bin/certtool
@@ -66,6 +94,13 @@ 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.
@@ -82,17 +117,29 @@ The key features are:
 * Liberal license (BSD) allows nbdkit to be linked to proprietary
   libraries or included in proprietary code.
 
-You probably want to install one of more plugins (%{name}-plugin-*).
+In Fedora, '%{name}' is a meta-package which pulls in the core server
+and a useful subset of plugins and filters.
 
-To develop plugins, install the %{name}-devel package and start by
+If you want just the server, install '%{name}-server'.
+
+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}%{?_isa} = %{version}-%{release}
+Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 # For upgrade path, remove these in Fedora 30.
 Obsoletes:      %{name}-plugin-file < 1.1.19-1
@@ -104,6 +151,10 @@ 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.
@@ -127,6 +178,14 @@ 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.
@@ -135,12 +194,16 @@ 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}%{?_isa} = %{version}-%{release}
+Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 # For upgrade path, remove this in Fedora 30.
 Obsoletes:      %{name}-plugin-examples < 1.1.19-1
@@ -153,167 +216,286 @@ This package contains example plugins for %{name}.
 # The plugins below have non-trivial dependencies are so are
 # packaged separately.
 
-%package plugin-curl
+%package curl-plugin
 Summary:        HTTP/FTP/SSH (cURL) plugin for %{name}
 License:        BSD
 
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+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}
 
 
-%description plugin-curl
+%description curl-plugin
 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 plugin-guestfs
+%package guestfs-plugin
 Summary:        libguestfs plugin for %{name}
 License:        BSD
 
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+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}
 
 
-%description plugin-guestfs
+%description guestfs-plugin
 This package is a libguestfs plugin for %{name}.
 %endif
 
 
-%package plugin-gzip
+%package gzip-plugin
 Summary:        GZip file serving plugin for %{name}
 License:        BSD
 
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+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}
 
 
-%description plugin-gzip
+%description gzip-plugin
 This package is a gzip file serving plugin for %{name}.
 
 
-%package plugin-libvirt
+%package libvirt-plugin
 Summary:        Libvirt plugin for %{name}
 License:        BSD
 
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+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}
 
 
-%description plugin-libvirt
+%description libvirt-plugin
 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 plugin-ocaml
+%package ocaml-plugin
 Summary:        OCaml plugin for %{name}
 License:        BSD
 
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+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}
 
 
-%description plugin-ocaml
+%description ocaml-plugin
 This package lets you run OCaml plugins for %{name}.
 
 To compile OCaml plugins you will also need to install
-%{name}-plugin-ocaml-devel.
+%{name}-ocaml-plugin-devel.
 
 
-%package plugin-ocaml-devel
+%package ocaml-plugin-devel
 Summary:        OCaml development environment for %{name}
 License:        BSD
 
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-Requires:       %{name}-plugin-ocaml%{?_isa} = %{version}-%{release}
+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}
 
 
-%description plugin-ocaml-devel
+%description ocaml-plugin-devel
 This package lets you write OCaml plugins for %{name}.
 %endif
 
 
-%package plugin-perl
+%package perl-plugin
 Summary:        Perl plugin for %{name}
 License:        BSD
 
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+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}
 
 
-%description plugin-perl
+%description perl-plugin
 This package lets you write Perl plugins for %{name}.
 
 
-%package plugin-python-common
+%package python-plugin-common
 Summary:        Python 2 and 3 plugin common files for %{name}
 License:        BSD
 
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+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}
 
 
-%description plugin-python-common
+%description python-plugin-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}-plugin-python2 or %{name}-plugin-python3.
+either %{name}-python2-plugin or %{name}-python3-plugin.
 
 
-%package plugin-python2
+%package python2-plugin
 Summary:        Python 2 plugin for %{name}
 License:        BSD
 
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-Requires:       %{name}-plugin-python-common = %{version}-%{release}
+Requires:       %{name}-server%{?_isa} = %{version}-%{release}
+Requires:       %{name}-python-plugin-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 plugin-python2
+
+%description python2-plugin
 This package lets you write Python 2 plugins for %{name}.
 
 
 %if 0%{?have_python3}
-%package plugin-python3
+%package python3-plugin
 Summary:        Python 3 plugin for %{name}
 License:        BSD
 
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-Requires:       %{name}-plugin-python-common = %{version}-%{release}
+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}
 
 
-%description plugin-python3
+%description python3-plugin
 This package lets you write Python 3 plugins for %{name}.
 %endif
 
 
-%package plugin-ruby
+%package ruby-plugin
 Summary:        Ruby plugin for %{name}
 License:        BSD
 
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+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}
 
 
-%description plugin-ruby
+%description ruby-plugin
 This package lets you write Ruby plugins for %{name}.
 
 
-%package plugin-tar
+%package tar-plugin
 Summary:        Tar archive plugin for %{name}
 License:        BSD
 
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name}-server%{?_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}
 
 
-%description plugin-tar
+%description tar-plugin
 This package is a tar archive plugin for %{name}.
 
 
-%package plugin-xz
+%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
 Summary:        XZ file serving plugin for %{name}
 License:        BSD
 
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+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}
 
 
-%description plugin-xz
+%description xz-plugin
 This package is a xz file serving plugin for %{name}.
 
 
@@ -321,13 +503,17 @@ This package is a xz file serving plugin for %{name}.
 Summary:        Basic filters for %{name}
 License:        BSD
 
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name}-server%{?_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.
@@ -340,6 +526,22 @@ 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.
@@ -348,12 +550,16 @@ 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}%{?_isa} = %{version}-%{release}
+Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig
 
 
@@ -363,13 +569,32 @@ 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
-%setup -q
-%autopatch -p1
+%if 0%{verify_tarball_signature}
+tmphome="$(mktemp -d)"
+gpgv2 --homedir "$tmphome" --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
+%endif
+%autosetup -p1
+%if 0%{patches_touch_autotools}
+autoreconf -i
+%endif
 
 %ifnarch %{complete_test_arches}
 # Simplify the test suite so it doesn't require qemu.
 sed -i -e '/^if HAVE_LIBGUESTFS/,/^endif HAVE_LIBGUESTFS/d' tests/Makefile.am
+sed -i -e '/^if HAVE_GUESTFISH/,/^endif HAVE_GUESTFISH/d' tests/Makefile.am
 autoreconf -i
 %endif
 
@@ -391,7 +616,7 @@ make %{?_smp_mflags}
 %if 0%{?have_python3}
 pushd python3
 export PYTHON=%{_bindir}/python3
-%configure --disable-static --disable-perl --disable-ocaml --disable-ruby
+%configure --disable-static --disable-lua --disable-perl --disable-ocaml --disable-ruby --disable-tcl
 # Verify that it picked the correct version of Python
 # to avoid RHBZ#1404631 happening again silently.
 grep '^PYTHON_VERSION = 3' Makefile
@@ -428,6 +653,13 @@ 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).
@@ -446,7 +678,7 @@ make check -j1 || {
 %if 0%{?have_libguestfs}
 %if 0%{?have_python3}
 pushd python3
-make check -j1 TESTS=test-python || {
+make check -j1 -C tests TESTS=test-python || {
     cat tests/test-suite.log
     exit 1
   }
@@ -462,6 +694,10 @@ popd
 
 
 %files
+# metapackage so empty
+
+
+%files server
 %doc README
 %license LICENSE
 %{_sbindir}/nbdkit
@@ -469,23 +705,35 @@ 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
@@ -496,15 +744,22 @@ popd
 %{_mandir}/man1/nbdkit-example*-plugin.1*
 
 
-%files plugin-curl
+%files curl-plugin
 %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 plugin-guestfs
+%files guestfs-plugin
 %doc README
 %license LICENSE
 %{_libdir}/%{name}/plugins/nbdkit-guestfs-plugin.so
@@ -512,72 +767,95 @@ popd
 %endif
 
 
-%files plugin-gzip
+%files gzip-plugin
 %doc README
 %license LICENSE
 %{_libdir}/%{name}/plugins/nbdkit-gzip-plugin.so
 %{_mandir}/man1/nbdkit-gzip-plugin.1*
 
 
-%files plugin-libvirt
+%files libvirt-plugin
 %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 plugin-ocaml
+%files ocaml-plugin
 %doc README
 %license LICENSE
 %{_libdir}/libnbdkitocaml.so.*
 
-%files plugin-ocaml-devel
+%files ocaml-plugin-devel
 %{_libdir}/libnbdkitocaml.so
 %{_libdir}/ocaml/NBDKit.*
 %{_mandir}/man3/nbdkit-ocaml-plugin.3*
 %endif
 
 
-%files plugin-perl
+%files perl-plugin
 %doc README
 %license LICENSE
 %{_libdir}/%{name}/plugins/nbdkit-perl-plugin.so
 %{_mandir}/man3/nbdkit-perl-plugin.3*
 
 
-%files plugin-python-common
+%files python-plugin-common
 %doc README
 %license LICENSE
 %{_mandir}/man3/nbdkit-python-plugin.3*
 
 
-%files plugin-python2
+%files python2-plugin
 %{_libdir}/%{name}/plugins/nbdkit-python-plugin.so
 %{_libdir}/%{name}/plugins/nbdkit-python2-plugin.so
 
 
 %if 0%{?have_python3}
-%files plugin-python3
+%files python3-plugin
 %{_libdir}/%{name}/plugins/nbdkit-python3-plugin.so
 %endif
 
 
-%files plugin-ruby
+%files ruby-plugin
 %doc README
 %license LICENSE
 %{_libdir}/%{name}/plugins/nbdkit-ruby-plugin.so
 %{_mandir}/man3/nbdkit-ruby-plugin.3*
 
 
-%files plugin-tar
+%files tar-plugin
 %doc README
 %license LICENSE
 %{_libdir}/%{name}/plugins/nbdkit-tar-plugin
 %{_mandir}/man1/nbdkit-tar-plugin.1*
 
 
-%files plugin-xz
+%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
 %doc README
 %license LICENSE
 %{_libdir}/%{name}/plugins/nbdkit-xz-plugin.so
@@ -587,16 +865,28 @@ 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
@@ -605,9 +895,11 @@ 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
@@ -616,7 +908,101 @@ 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.
+
+* 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.
+- 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.
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* 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.
+- 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.
+- 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.
+
 * Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.1.28-5
 - Escape macros in %%changelog
 

sources

@@ -1 +1,2 @@
-SHA512 (nbdkit-1.1.28.tar.gz) = cbf40dffc773575a69d20edc42570bf63bd5f189ec0a3c4beeca7fca518ec969b94a15fdc834762f322c99145a95a015f5aad60edb078ba98c7b805583218fef
+SHA512 (nbdkit-1.5.6.tar.gz) = bacdc95b909e943e6476f24d10e7e9e2ea0b9e26362c35c604c8e1cdf361e333e47c38747b491077e9444466e014fe9f67c6db8be3a98f1f0e7bffee555c1bc0
+SHA512 (nbdkit-1.5.6.tar.gz.sig) = 96917b05005adba7333073b4ba91b3b499f76c418833344cda5a93603a84bc78421749f5ed13432323216f0b1195bf0bbebd63ba4959390568b7a4289a69d0db