New upstream version 1.1.19.

Combine all the simple plugins in nbdkit-basic-plugins. Add memory and null plugins. Rename the example plugins subpackage. Use %license instead of %doc for license file. Remove patches now upstream.
2017-11-30 12:48:21 +00:00 · 2017-11-30 12:48:21 +00:00 · d568866d80
parent 05a3e073d0
commit d568866d80
6 changed files with 113 additions and 204 deletions
--- a/0001-plugins-nbd-Fix-small-typo-in-the-documentation.patch
+++ b/0001-plugins-nbd-Fix-small-typo-in-the-documentation.patch
@ -1,26 +0,0 @@
-From 937be0da588a9374ae38363ed11e168c98370be5 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Tue, 21 Nov 2017 21:54:57 +0000
-Subject: [PATCH 1/4] plugins: nbd: Fix small typo in the documentation.
-
-Fixes commit 0e8e8eb11d6b70d262a99b5b630af354768bfc61.
---
- plugins/nbd/nbdkit-nbd-plugin.pod | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/nbd/nbdkit-nbd-plugin.pod b/plugins/nbd/nbdkit-nbd-plugin.pod
-index e02e6cc..2b3a054 100644
--- a/plugins/nbd/nbdkit-nbd-plugin.pod
-+++ b/plugins/nbd/nbdkit-nbd-plugin.pod
-@@ -16,7 +16,7 @@ It provides an NBD server that forwards all traffic as a client to
- another existing NBD server.  A primary usage of this setup is to
- alter the set of features available to the ultimate end client,
- without having to change the original server (for example, to convert
-between oldstyle and newtyle, or to add TLS support where the original
-+between oldstyle and newstyle, or to add TLS support where the original
- server lacks it).
- 
- For now, this is limited to connecting to another NBD server over a
-- 
-2.13.2
-
--- a/0002-plugins-perl-Minor-typographical-fixes-to-the-man-pa.patch
+++ b/0002-plugins-perl-Minor-typographical-fixes-to-the-man-pa.patch
@ -1,34 +0,0 @@
-From 55be677eb156146bcdcdf332854b02dc1064ef7b Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Tue, 21 Nov 2017 22:18:36 +0000
-Subject: [PATCH 2/4] plugins: perl: Minor typographical fixes to the man page.
-
---
- plugins/perl/nbdkit-perl-plugin.pod | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/plugins/perl/nbdkit-perl-plugin.pod b/plugins/perl/nbdkit-perl-plugin.pod
-index 2ecdcf1..7d5a68d 100644
--- a/plugins/perl/nbdkit-perl-plugin.pod
-+++ b/plugins/perl/nbdkit-perl-plugin.pod
-@@ -63,14 +63,14 @@ script won't work.
- =head2 METHODS
- 
- Your script has access to the following methods in the C<Nbdkit>
-package (in fact, attempting to C<use Nbdkit;> will fail, the methods
-+package (in fact, attempting to C<use Nbdkit> will fail, the methods
- are already available):
- 
- Nbdkit::set_error(I<$err>)
-+ Nbdkit::set_error($err);
- 
- Record C<$err> as the reason you are about to throw an exception. C<$err>
- should correspond to usual errno values, where it may help to
-C<use POSIX();>.
-+C<use POSIX()>.
- 
- =head2 EXCEPTIONS
- 
-- 
-2.13.2
-
--- a/0003-docs-Small-fix-to-documentation-of-threads-option.patch
+++ b/0003-docs-Small-fix-to-documentation-of-threads-option.patch
@ -1,26 +0,0 @@
-From 2264f3bbbc3cb52cee4bea86da7c34d7f9a38e65 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Tue, 21 Nov 2017 22:35:28 +0000
-Subject: [PATCH 3/4] docs: Small fix to documentation of --threads option.
-
-Fixes commit e9516a147ace4e302d7eec0a2a81ddad1c5bfb00.
---
- docs/nbdkit.pod | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/docs/nbdkit.pod b/docs/nbdkit.pod
-index 4593391..fb923c1 100644
--- a/docs/nbdkit.pod
-+++ b/docs/nbdkit.pod
-@@ -232,7 +232,7 @@ Unix domain sockets:
- 
- =item B<-t> THREADS
- 
-= item B<--threads> THREADS
-+=item B<--threads> THREADS
- 
- Set the number of threads to be used per connection, which in turn
- controls the number of outstanding requests that can be processed at
-- 
-2.13.2
-
--- a/0004-docs-Describe-dump-plugin-earlier-in-the-manual.patch
+++ b/0004-docs-Describe-dump-plugin-earlier-in-the-manual.patch
@ -1,27 +0,0 @@
-From 1b4f7c713e2acddad110434c9d1587eb94fc39c5 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Tue, 21 Nov 2017 22:38:03 +0000
-Subject: [PATCH 4/4] docs: Describe --dump-plugin earlier in the manual.
-
---
- docs/nbdkit.pod | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/docs/nbdkit.pod b/docs/nbdkit.pod
-index fb923c1..5dac12d 100644
--- a/docs/nbdkit.pod
-+++ b/docs/nbdkit.pod
-@@ -324,6 +324,10 @@ To list all the options supported by a plugin, do:
- 
-  nbdkit --help file
- 
-+To dump information about a plugin, do:
-+
-+ nbdkit file --dump-plugin
-+
- =head1 SOCKET ACTIVATION
- 
- nbdkit supports socket activation (sometimes called systemd socket
-- 
-2.13.2
-
--- a/nbdkit.spec
+++ b/nbdkit.spec
@ -10,8 +10,8 @@
 %endif

 Name:           nbdkit
-Version:        1.1.18
-Release:        4%{?dist}
+Version:        1.1.19
+Release:        1%{?dist}
 Summary:        NBD server

 License:        BSD
@ -19,11 +19,6 @@ URL:            https://github.com/libguestfs/nbdkit

 Source0:        http://libguestfs.org/download/nbdkit/%{name}-%{version}.tar.gz

-Patch0001:      0001-plugins-nbd-Fix-small-typo-in-the-documentation.patch
-Patch0002:      0002-plugins-perl-Minor-typographical-fixes-to-the-man-pa.patch
-Patch0003:      0003-docs-Small-fix-to-documentation-of-threads-option.patch
-Patch0004:      0004-docs-Describe-dump-plugin-earlier-in-the-manual.patch
-
 %if 0%{?rhel} == 7
 # On RHEL 7, nothing in the virt stack is shipped on aarch64 and
 # libguestfs was not shipped on POWER (fixed in 7.5).  We could in
@ -78,6 +73,67 @@ To develop plugins, install the %{name}-devel package and start by
 reading the nbdkit(1) and nbdkit-plugin(3) manual pages.


+%package basic-plugins
+Summary:        Basic plugins for %{name}
+License:        BSD
+
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+# For upgrade path, remove these in Fedora 30.
+Obsoletes:      %{name}-plugin-file < 1.1.19-1
+Obsoletes:      %{name}-plugin-nbd < 1.1.19-1
+Obsoletes:      %{name}-plugin-streaming < 1.1.19-1
+
+
+%description basic-plugins
+This package contains some basic plugins for %{name} which have only
+trivial dependencies.
+
+* nbdkit-file-plugin
+
+  A file serving plugin.
+
+* nbdkit-memory-plugin
+
+  A virtual memory plugin.
+
+* nbdkit-nbd-plugin
+
+  An NBD forwarding plugin.
+
+  It provides an NBD server that forwards all traffic as a client to
+  another existing NBD server.  A primary usage of this setup is to
+  alter the set of features available to the ultimate end client,
+  without having to change the original server (for example, to
+  convert between oldstyle and newtyle, or to add TLS support where
+  the original server lacks it).
+
+* nbdkit-null-plugin
+
+  A null (bitbucket) plugin.
+
+* nbdkit-streaming-plugin
+
+  A streaming file serving plugin.
+
+
+%package example-plugins
+Summary:        Example plugins for %{name}
+License:        BSD
+
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+# For upgrade path, remove this in Fedora 30.
+Obsoletes:      %{name}-plugin-examples < 1.1.19-1
+
+
+%description example-plugins
+This package contains example plugins for %{name}.
+
+
+# The plugins below have non-trivial dependencies are so are
+# packaged separately.
+
 %package plugin-curl
 Summary:        HTTP/FTP/SSH (cURL) plugin for %{name}
 License:        BSD
@ -89,28 +145,6 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 This package contains cURL (HTTP/FTP/SSH) support for %{name}.


-%package plugin-examples
-Summary:        Example plugins for %{name}
-License:        BSD
-
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-
-
-%description plugin-examples
-This package contains example plugins for %{name}.
-
-
-%package plugin-file
-Summary:        File serving plugin for %{name}
-License:        BSD
-
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-
-
-%description plugin-file
-This package is a file serving plugin for %{name}.
-
-
 %if 0%{?have_libguestfs}
 %package plugin-guestfs
 Summary:        libguestfs plugin for %{name}
@ -148,24 +182,6 @@ libvirt guest disks readonly.  It is implemented using the libvirt
 virDomainBlockPeek API.


-%package plugin-nbd
-Summary:        NBD forwarding plugin for %{name}
-License:        BSD
-
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-
-
-%description plugin-nbd
-This package is an NBD forwarding plugin for %{name}.
-
-It provides an NBD server that forwards all traffic as a client to
-another existing NBD server.  A primary usage of this setup is to alter
-the set of features available to the ultimate end client, without
-having to change the original server (for example, to convert between
-oldstyle and newtyle, or to add TLS support where the original server
-lacks it).
-
-
 %ifarch %{ocaml_native_compiler}
 %package plugin-ocaml
 Summary:        OCaml plugin for %{name}
@ -260,17 +276,6 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 This package lets you write Ruby plugins for %{name}.


-%package plugin-streaming
-Summary:        Streaming file serving plugin for %{name}
-License:        BSD
-
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-
-
-%description plugin-streaming
-This package is a streaming plugin for %{name}.
-
-
 %package plugin-xz
 Summary:        XZ file serving plugin for %{name}
 License:        BSD
@ -395,60 +400,70 @@ popd


 %files
-%doc LICENSE README
+%doc README
+%license LICENSE
 %{_sbindir}/nbdkit
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/plugins
 %{_mandir}/man1/nbdkit.1*


-%files plugin-curl
-%doc LICENSE README
-%{_libdir}/%{name}/plugins/nbdkit-curl-plugin.so
-%{_mandir}/man1/nbdkit-curl-plugin.1*
+%files basic-plugins
+%doc README
+%license LICENSE
+%{_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-streaming-plugin.so
+%{_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-streaming-plugin.1*


-%files plugin-examples
-%doc LICENSE README
+%files example-plugins
+%doc README
+%license LICENSE
 %{_libdir}/%{name}/plugins/nbdkit-example*-plugin.so
 %{_mandir}/man1/nbdkit-example*-plugin.1*


-%files plugin-file
-%doc LICENSE README
-%{_libdir}/%{name}/plugins/nbdkit-file-plugin.so
-%{_mandir}/man1/nbdkit-file-plugin.1*
+%files plugin-curl
+%doc README
+%license LICENSE
+%{_libdir}/%{name}/plugins/nbdkit-curl-plugin.so
+%{_mandir}/man1/nbdkit-curl-plugin.1*


 %if 0%{?have_libguestfs}
 %files plugin-guestfs
-%doc LICENSE README
+%doc README
+%license LICENSE
 %{_libdir}/%{name}/plugins/nbdkit-guestfs-plugin.so
 %{_mandir}/man1/nbdkit-guestfs-plugin.1*
 %endif


 %files plugin-gzip
-%doc LICENSE README
+%doc README
+%license LICENSE
 %{_libdir}/%{name}/plugins/nbdkit-gzip-plugin.so
 %{_mandir}/man1/nbdkit-gzip-plugin.1*


 %files plugin-libvirt
-%doc LICENSE README
+%doc README
+%license LICENSE
 %{_libdir}/%{name}/plugins/nbdkit-libvirt-plugin.so
 %{_mandir}/man1/nbdkit-libvirt-plugin.1*


-%files plugin-nbd
-%doc LICENSE README
-%{_libdir}/%{name}/plugins/nbdkit-nbd-plugin.so
-%{_mandir}/man1/nbdkit-nbd-plugin.1*
-
-
 %ifarch %{ocaml_native_compiler}
 %files plugin-ocaml
-%doc LICENSE README
+%doc README
+%license LICENSE
 %{_libdir}/libnbdkitocaml.so.*

 %files plugin-ocaml-devel
@ -459,13 +474,15 @@ popd


 %files plugin-perl
-%doc LICENSE README
+%doc README
+%license LICENSE
 %{_libdir}/%{name}/plugins/nbdkit-perl-plugin.so
 %{_mandir}/man3/nbdkit-perl-plugin.3*


 %files plugin-python-common
-%doc LICENSE README
+%doc README
+%license LICENSE
 %{_mandir}/man3/nbdkit-python-plugin.3*


@ -481,25 +498,22 @@ popd


 %files plugin-ruby
-%doc LICENSE README
+%doc README
+%license LICENSE
 %{_libdir}/%{name}/plugins/nbdkit-ruby-plugin.so
 %{_mandir}/man3/nbdkit-ruby-plugin.3*


-%files plugin-streaming
-%doc LICENSE README
-%{_libdir}/%{name}/plugins/nbdkit-streaming-plugin.so
-%{_mandir}/man1/nbdkit-streaming-plugin.1*
-
-
 %files plugin-xz
-%doc LICENSE README
+%doc README
+%license LICENSE
 %{_libdir}/%{name}/plugins/nbdkit-xz-plugin.so
 %{_mandir}/man1/nbdkit-xz-plugin.1*


 %files devel
-%doc LICENSE README TODO
+%doc OTHER_PLUGINS README TODO
+%license LICENSE
 # Include the source of the example plugins in the documentation.
 %doc plugins/example*/*.c
 %doc plugins/perl/example.pl
@ -510,6 +524,14 @@ popd


 %changelog
+* Thu Nov 30 2017 Richard W.M. Jones <rjones@redhat.com> - 1.1.19-1
+- New upstream version 1.1.19.
+- Combine all the simple plugins in %{name}-basic-plugins.
+- Add memory and null plugins.
+- Rename the example plugins subpackage.
+- Use %%license instead of %%doc for license file.
+- Remove patches now upstream.
+
 * Wed Nov 29 2017 Richard W.M. Jones <rjones@redhat.com> - 1.1.18-4
 - Fix Python 3 builds / RHEL macros (RHBZ#1404631).

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (nbdkit-1.1.18.tar.gz) = 62ebe50eb7c3e2faac66f763cc8d8b206c76692cd6f865acb4753fdb16ca3ee466b90f52daff1c9a54e6554103cfeb7752c4007f3dca6765d3c85f32e89c0c33
+SHA512 (nbdkit-1.1.19.tar.gz) = a0e8999f8c258bb8ef589d5d3b3fb3e51efed1d1d0088fdbcb05f4fdd75c9074829e294257dc241cbaed26a70bd1f409093c159c76e6cf46ed803abdec3bbed9