- up to 1.24.2

diff --git a/nbdkit.spec b/nbdkit.spec
index 75f6f16e75bcb2764751b770abb6985178cc38d2..c76b4f12014a9034c28df7ff4325da95b510da09 100644 (file)
--- a/nbdkit.spec
+++ b/nbdkit.spec
@@ -12,12 +12,12 @@
 Summary:       Toolkit for creating NBD servers
 Summary(pl.UTF-8):     Narzędzia do tworzenia serwerów NBD
 Name:          nbdkit
-Version:       1.1.11
-Release:       8
+Version:       1.24.2
+Release:       1
 License:       BSD
 Group:         Applications/System
-Source0:       http://libguestfs.org/download/nbdkit/%{name}-%{version}.tar.gz
-# Source0-md5: c03d66a7ad5f7f08a171d6845dc28c48
+Source0:       http://libguestfs.org/download/nbdkit/1.24-stable/%{name}-%{version}.tar.gz
+# Source0-md5: ba9319e544d5a728ebfee84953968b9e
 URL:           http://libguestfs.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -172,7 +172,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/nbdkit/filters/*.la
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/nbdkit/plugins/*.la
+
 %if %{with ocaml}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libnbdkitocaml.la
 %endif
@@ -188,22 +190,161 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE README TODO
 %attr(755,root,root) %{_sbindir}/nbdkit
 %dir %{_libdir}/nbdkit
+%dir %{_libdir}/nbdkit/filters
+%attr(755,root,root) %{_libdir}/nbdkit/filters
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-blocksize-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-cache-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-cacheextents-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-checkwrite-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-cow-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-ddrescue-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-delay-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-error-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-exitlast-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-exitwhen-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-exportname-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-ext2-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-extentlist-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-fua-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-gzip-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-ip-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-limit-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-log-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-nocache-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-noextents-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-nofilter-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-noparallel-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-nozero-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-offset-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-partition-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-pause-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-rate-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-readahead-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-retry-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-stats-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-swab-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-tar-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-tls-fallback-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-truncate-filter.so
+%attr(755,root,root) %{_libdir}/nbdkit/filters/nbdkit-xz-filter.so
 %dir %{_libdir}/nbdkit/plugins
+%attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-S3-plugin
+%attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-cc-plugin.so
+%attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-cdi-plugin.so
+%attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-data-plugin.so
+%attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-eval-plugin.so
 %attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-example1-plugin.so
 %attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-example2-plugin.so
 %attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-example3-plugin.so
+%attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-example4-plugin
 %attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-file-plugin.so
+%attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-floppy-plugin.so
+%attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-full-plugin.so
 %attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-gzip-plugin.so
+%attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-info-plugin.so
+%attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-iso-plugin.so
+%attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-lua-plugin.so
+%attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-memory-plugin.so
+%attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-null-plugin.so
+%attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-ondemand-plugin.so
+%attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-partitioning-plugin.so
+%attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-pattern-plugin.so
+%attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-random-plugin.so
+%attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-sh-plugin.so
+%attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-sparse-random-plugin.so
+%attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-split-plugin.so
+%attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-ssh-plugin.so
 %attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-streaming-plugin.so
-%attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-xz-plugin.so
+%attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-tar-plugin.so
+%attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-tcl-plugin.so
+%attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-tmpdisk-plugin.so
+%attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-torrent-plugin.so
+%attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-vddk-plugin.so
+%attr(755,root,root) %{_libdir}/nbdkit/plugins/nbdkit-zero-plugin.so
 %{_mandir}/man1/nbdkit.1*
+%{_mandir}/man1/nbdkit-blocksize-filter.1*
+%{_mandir}/man1/nbdkit-cacheextents-filter.1*
+%{_mandir}/man1/nbdkit-cache-filter.1*
+%{_mandir}/man1/nbdkit-captive.1*
+%{_mandir}/man1/nbdkit-cdi-plugin.1*
+%{_mandir}/man1/nbdkit-checkwrite-filter.1*
+%{_mandir}/man1/nbdkit-client.1*
+%{_mandir}/man1/nbdkit-cow-filter.1*
+%{_mandir}/man1/nbdkit-data-plugin.1*
+%{_mandir}/man1/nbdkit-ddrescue-filter.1*
+%{_mandir}/man1/nbdkit-delay-filter.1*
+%{_mandir}/man1/nbdkit-error-filter.1*
+%{_mandir}/man1/nbdkit-eval-plugin.1*
 %{_mandir}/man1/nbdkit-example1-plugin.1*
 %{_mandir}/man1/nbdkit-example2-plugin.1*
 %{_mandir}/man1/nbdkit-example3-plugin.1*
+%{_mandir}/man1/nbdkit-example4-plugin.1*
+%{_mandir}/man1/nbdkit-exitlast-filter.1*
+%{_mandir}/man1/nbdkit-exitwhen-filter.1*
+%{_mandir}/man1/nbdkit-exportname-filter.1*
+%{_mandir}/man1/nbdkit-ext2-filter.1*
+%{_mandir}/man1/nbdkit-extentlist-filter.1*
 %{_mandir}/man1/nbdkit-file-plugin.1*
+%{_mandir}/man1/nbdkit-floppy-plugin.1*
+%{_mandir}/man1/nbdkit-fua-filter.1*
+%{_mandir}/man1/nbdkit-full-plugin.1*
+%{_mandir}/man1/nbdkit-gzip-filter.1*
 %{_mandir}/man1/nbdkit-gzip-plugin.1*
+%{_mandir}/man1/nbdkit-info-plugin.1*
+%{_mandir}/man1/nbdkit-ip-filter.1*
+%{_mandir}/man1/nbdkit-iso-plugin.1*
+%{_mandir}/man1/nbdkit-limit-filter.1*
+%{_mandir}/man1/nbdkit-log-filter.1*
+%{_mandir}/man1/nbdkit-loop.1*
+%{_mandir}/man1/nbdkit-memory-plugin.1*
+%{_mandir}/man1/nbdkit-nocache-filter.1*
+%{_mandir}/man1/nbdkit-noextents-filter.1*
+%{_mandir}/man1/nbdkit-nofilter-filter.1*
+%{_mandir}/man1/nbdkit-noparallel-filter.1*
+%{_mandir}/man1/nbdkit-nozero-filter.1*
+%{_mandir}/man1/nbdkit-null-plugin.1*
+%{_mandir}/man1/nbdkit-offset-filter.1*
+%{_mandir}/man1/nbdkit-ondemand-plugin.1*
+%{_mandir}/man1/nbdkit-partition-filter.1*
+%{_mandir}/man1/nbdkit-partitioning-plugin.1*
+%{_mandir}/man1/nbdkit-pattern-plugin.1*
+%{_mandir}/man1/nbdkit-pause-filter.1*
+%{_mandir}/man1/nbdkit-probing.1*
+%{_mandir}/man1/nbdkit-protocol.1*
+%{_mandir}/man1/nbdkit-random-plugin.1*
+%{_mandir}/man1/nbdkit-rate-filter.1*
+%{_mandir}/man1/nbdkit-readahead-filter.1*
+%{_mandir}/man1/nbdkit-release-notes-1.10.1*
+%{_mandir}/man1/nbdkit-release-notes-1.12.1*
+%{_mandir}/man1/nbdkit-release-notes-1.14.1*
+%{_mandir}/man1/nbdkit-release-notes-1.16.1*
+%{_mandir}/man1/nbdkit-release-notes-1.18.1*
+%{_mandir}/man1/nbdkit-release-notes-1.20.1*
+%{_mandir}/man1/nbdkit-release-notes-1.22.1*
+%{_mandir}/man1/nbdkit-release-notes-1.24.1*
+%{_mandir}/man1/nbdkit-release-notes-1.4.1*
+%{_mandir}/man1/nbdkit-release-notes-1.6.1*
+%{_mandir}/man1/nbdkit-release-notes-1.8.1*
+%{_mandir}/man1/nbdkit-retry-filter.1*
+%{_mandir}/man1/nbdkit-S3-plugin.1*
+%{_mandir}/man1/nbdkit-security.1*
+%{_mandir}/man1/nbdkit-service.1*
+%{_mandir}/man1/nbdkit-sparse-random-plugin.1*
+%{_mandir}/man1/nbdkit-split-plugin.1*
+%{_mandir}/man1/nbdkit-ssh-plugin.1*
+%{_mandir}/man1/nbdkit-stats-filter.1*
 %{_mandir}/man1/nbdkit-streaming-plugin.1*
-%{_mandir}/man1/nbdkit-xz-plugin.1*
+%{_mandir}/man1/nbdkit-swab-filter.1*
+%{_mandir}/man1/nbdkit-tar-filter.1*
+%{_mandir}/man1/nbdkit-tar-plugin.1*
+%{_mandir}/man1/nbdkit-tls.1*
+%{_mandir}/man1/nbdkit-tls-fallback-filter.1*
+%{_mandir}/man1/nbdkit-tmpdisk-plugin.1*
+%{_mandir}/man1/nbdkit-torrent-plugin.1*
+%{_mandir}/man1/nbdkit-truncate-filter.1*
+%{_mandir}/man1/nbdkit-vddk-plugin.1*
+%{_mandir}/man1/nbdkit-xz-filter.1*
+%{_mandir}/man1/nbdkit-zero-plugin.1*
 
 %files plugin-curl
 %defattr(644,root,root,755)
@@ -255,5 +396,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
+%{_includedir}/nbdkit-common.h
+%{_includedir}/nbdkit-filter.h
 %{_includedir}/nbdkit-plugin.h
+%{_includedir}/nbdkit-version.h
+%{_includedir}/nbd-protocol.h
 %{_mandir}/man3/nbdkit-plugin.3*
+%{_pkgconfigdir}/nbdkit.pc
+%{_mandir}/man3/NBDKit.3*
+%{_mandir}/man3/nbdkit-cc-plugin.3*
+%{_mandir}/man3/nbdkit-filter.3*
+%{_mandir}/man3/nbdkit-golang-plugin.3*
+%{_mandir}/man3/nbdkit-lua-plugin.3*
+%{_mandir}/man3/nbdkit-rust-plugin.3*
+%{_mandir}/man3/nbdkit-sh-plugin.3*
+%{_mandir}/man3/nbdkit-tcl-plugin.3*