From 2e34434f23aa6def6c6e8967a3ad5ae993445cd1 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 25 Jun 2020 10:24:42 +0100
Subject: [PATCH] New upstream development version 1.21.13.

- Tar plugin rewritten again in C.
- New nbdkit-torrent-plugin.
- Remove various upgrade paths which are no longer needed in F33.
---
 nbdkit.spec | 45 +++++++++++++++++++++++++++++----------------
 sources     |  4 ++--
 2 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/nbdkit.spec b/nbdkit.spec
index a91d49b..bfdbd76 100644
--- a/nbdkit.spec
+++ b/nbdkit.spec
@@ -44,8 +44,8 @@ ExclusiveArch:  x86_64
 %global source_directory 1.21-development
 
 Name:           nbdkit
-Version:        1.21.12
-Release:        3%{?dist}
+Version:        1.21.13
+Release:        1%{?dist}
 Summary:        NBD server
 
 License:        BSD
@@ -81,6 +81,7 @@ BuildRequires:  libnbd-devel >= 0.9.8
 BuildRequires:  libssh-devel
 BuildRequires:  e2fsprogs, e2fsprogs-devel
 BuildRequires:  genisoimage
+BuildRequires:  rb_libtorrent-devel
 BuildRequires:  bash-completion
 BuildRequires:  perl-devel
 BuildRequires:  perl(ExtUtils::Embed)
@@ -381,12 +382,6 @@ This package lets you write Perl plugins for %{name}.
 Summary:        Python 3 plugin for %{name}
 License:        BSD
 
-# Remove in Fedora 33:
-Provides:       %{name}-python3-plugin = %{version}-%{release}
-Obsoletes:      %{name}-python3-plugin <= %{version}-%{release}
-Provides:       %{name}-python-plugin-common = %{version}-%{release}
-Obsoletes:      %{name}-python-plugin-common <= %{version}-%{release}
-
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 
@@ -421,9 +416,7 @@ Summary:        Tar archive plugin for %{name}
 License:        BSD
 
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
-# XXX These should be autogenerated.
-Requires:       %{name}-python-plugin
-Requires:       python3-libs
+Requires:       tar
 
 
 %description tar-plugin
@@ -456,6 +449,17 @@ Suggests:       xfsprogs, ntfsprogs, dosfstools
 This package is a remote temporary filesystem disk plugin for %{name}.
 
 
+%package torrent-plugin
+Summary:        BitTorrent plugin for %{name}
+License:        BSD
+
+Requires:       %{name}-server%{?_isa} = %{version}-%{release}
+
+
+%description torrent-plugin
+This package is a BitTorrent plugin for %{name}.
+
+
 %ifarch x86_64
 %package vddk-plugin
 Summary:        VMware VDDK plugin for %{name}
@@ -580,10 +584,6 @@ License:        BSD
 
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
-# Remove in Fedora 33:
-Provides:       %{name}-xz-plugin = %{version}-%{release}
-Obsoletes:      %{name}-xz-plugin <= %{version}-%{release}
-
 
 %description xz-filter
 This package is the xz filter for %{name}.
@@ -879,7 +879,7 @@ make %{?_smp_mflags} check || {
 %files tar-plugin
 %doc README
 %license LICENSE
-%{_libdir}/%{name}/plugins/nbdkit-tar-plugin
+%{_libdir}/%{name}/plugins/nbdkit-tar-plugin.so
 %{_mandir}/man1/nbdkit-tar-plugin.1*
 
 
@@ -897,6 +897,13 @@ make %{?_smp_mflags} check || {
 %{_mandir}/man1/nbdkit-tmpdisk-plugin.1*
 
 
+%files torrent-plugin
+%doc README
+%license LICENSE
+%{_libdir}/%{name}/plugins/nbdkit-torrent-plugin.so
+%{_mandir}/man1/nbdkit-torrent-plugin.1*
+
+
 %ifarch x86_64
 %files vddk-plugin
 %doc README
@@ -1008,6 +1015,12 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
+* Mon Jun 29 2020 Richard W.M. Jones <rjones@redhat.com> - 1.21.13-1
+- New upstream development version 1.21.13.
+- Tar plugin rewritten again in C.
+- New nbdkit-torrent-plugin.
+- Remove various upgrade paths which are no longer needed in F33.
+
 * Sat Jun 27 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.21.12-3
 - Perl 5.32 re-rebuild updated packages
 
diff --git a/sources b/sources
index dded95c..33d6a24 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (nbdkit-1.21.12.tar.gz) = a35fe5738f7b5c5568a3220ed2564be1815b1e229730a37f016bc5012b115d4e531c6aada1b3b7cfd01f269b523c01ed6c25208d1b48303d7b39897b797deae2
-SHA512 (nbdkit-1.21.12.tar.gz.sig) = 097261f2b48d6a269029f291fb9527d22662a84d5d051efff61255fde5550e34f144dd1acc397ecd679ea3aa8a630d8c228fa37ee7a4bab0d0bd899ca689df9b
+SHA512 (nbdkit-1.21.13.tar.gz) = 1a11ae9e8c015d2cd1b9fe33e162afb48ca184755d8589f059b0380b978007f97132c5f0242497c059846694314f5c4fbf1dbe6981b2d9466a4c0933f50bc233
+SHA512 (nbdkit-1.21.13.tar.gz.sig) = 38ac0b090f0ea46c49ac564c1639d1b3f06789e9b7e49a267210e68870daca132fb6a19f748d2c50bd647bcc837b62690e15e22b3de49e2b442fab8a1678598c