From 07c3f3b029c93dadecad6982cae4a309265ea456 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 18 Jul 2020 17:34:28 +0100
Subject: [PATCH] New upstream development version 1.21.19. New
 nbdkit-cdi-plugin.

---
 nbdkit.spec | 40 ++++++++++++++++++++++++++++++++--------
 sources     |  4 ++--
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/nbdkit.spec b/nbdkit.spec
index 83e75b4..ba90275 100644
--- a/nbdkit.spec
+++ b/nbdkit.spec
@@ -44,7 +44,7 @@ ExclusiveArch:  x86_64
 %global source_directory 1.21-development
 
 Name:           nbdkit
-Version:        1.21.18
+Version:        1.21.19
 Release:        1%{?dist}
 Summary:        NBD server
 
@@ -243,6 +243,19 @@ for %{name}.  NOTE this is NOT the right package for writing plugins
 in C, install %{name}-devel for that.
 
 
+%package cdi-plugin
+Summary:        Containerized Data Import plugin for %{name}
+License:        BSD
+
+Requires:       %{name}-server%{?_isa} = %{version}-%{release}
+Requires:       jq
+Requires:       podman
+
+
+%description cdi-plugin
+This package contains Containerized Data Import support for %{name}.
+
+
 %package curl-plugin
 Summary:        HTTP/FTP (cURL) plugin for %{name}
 License:        BSD
@@ -788,13 +801,6 @@ make %{?_smp_mflags} check || {
 %{_mandir}/man1/nbdkit-example*-plugin.1*
 
 
-%files curl-plugin
-%doc README
-%license LICENSE
-%{_libdir}/%{name}/plugins/nbdkit-curl-plugin.so
-%{_mandir}/man1/nbdkit-curl-plugin.1*
-
-
 %files cc-plugin
 %doc README
 %license LICENSE
@@ -802,6 +808,20 @@ make %{?_smp_mflags} check || {
 %{_mandir}/man3/nbdkit-cc-plugin.3*
 
 
+%files cdi-plugin
+%doc README
+%license LICENSE
+%{_libdir}/%{name}/plugins/nbdkit-cdi-plugin.so
+%{_mandir}/man1/nbdkit-cdi-plugin.1*
+
+
+%files curl-plugin
+%doc README
+%license LICENSE
+%{_libdir}/%{name}/plugins/nbdkit-curl-plugin.so
+%{_mandir}/man1/nbdkit-curl-plugin.1*
+
+
 %if 0%{?have_libguestfs}
 %files guestfs-plugin
 %doc README
@@ -1044,6 +1064,10 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
+* Sat Jul 18 2020 Richard W.M. Jones <rjones@redhat.com> - 1.21.19-1
+- New upstream development version 1.21.19.
+- New nbdkit-cdi-plugin.
+
 * Mon Jul 13 2020 Richard W.M. Jones <rjones@redhat.com> - 1.21.18-1
 - New upstream development version 1.21.18.
 - Fixes nbdkit-gzip-filter.
diff --git a/sources b/sources
index 599df62..42a55d8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (nbdkit-1.21.18.tar.gz) = 5ea583774d16aa3038e361082f82912a48e179dc36363da8244b14f7d89e638a665162e730ad00b2e8ee2bf2f7991cd72bda88497da78e1c262a02ed4feda6c4
-SHA512 (nbdkit-1.21.18.tar.gz.sig) = f3621d81137a69b567775fd07d0fc17a571f02ee5b972380400536b9d8ba900cf139ea649e190b4ccd6256016cfa87ea119121842e010b16a1511035aa4598d6
+SHA512 (nbdkit-1.21.19.tar.gz) = 2e0782b66e36d9c136715c42ab111f0325dc6dc3da7bf7b413a1d06f2b7364e8f2ba544d6d8dab5a41db7eb11b2af1ef964eb567c9b052eede75a86e8e6b8362
+SHA512 (nbdkit-1.21.19.tar.gz.sig) = bb9e0686da3c1922d8745060a2f7b1e1fe23e9e435432e297f91da23fe675f482e265752c8a0de4c08c016e351a1ac23ec3317153e31538a0c60d9036d3a7e30