From a7dbaded7d4bb759c44dc86535032bf003102d29 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 6 Apr 2019 16:14:09 +0100
Subject: [PATCH] New upstream version 1.11.14. Remove deprecated
 nbdkit-xz-plugin (replaced by nbdkit-xz-filter).

---
 nbdkit.spec | 31 +++++++++----------------------
 sources     |  4 ++--
 2 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/nbdkit.spec b/nbdkit.spec
index 55e0527..1a0eca8 100644
--- a/nbdkit.spec
+++ b/nbdkit.spec
@@ -27,7 +27,7 @@
 %global source_directory 1.11-development
 
 Name:           nbdkit
-Version:        1.11.13
+Version:        1.11.14
 Release:        1%{?dist}
 Summary:        NBD server
 
@@ -410,20 +410,6 @@ VMware VDDK for accessing VMware disks and servers.
 %endif
 
 
-%package xz-plugin
-Summary:        XZ file serving plugin for %{name}
-License:        BSD
-
-Requires:       %{name}-server%{?_isa} = %{version}-%{release}
-
-
-%description xz-plugin
-This package is a xz file serving plugin for %{name}.
-
-This is deprecated and will be removed in %{name} 1.12.  You should
-start to use %{name}-xz-filter instead.
-
-
 %package basic-filters
 Summary:        Basic filters for %{name}
 License:        BSD
@@ -468,6 +454,10 @@ 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}.
@@ -762,13 +752,6 @@ make %{?_smp_mflags} check || {
 %endif
 
 
-%files xz-plugin
-%doc README
-%license LICENSE
-%{_libdir}/%{name}/plugins/nbdkit-xz-plugin.so
-%{_mandir}/man1/nbdkit-xz-plugin.1*
-
-
 %files basic-filters
 %doc README
 %license LICENSE
@@ -834,6 +817,10 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
+* Sat Apr 06 2019 Richard W.M. Jones <rjones@redhat.com> - 1.11.14-1
+- New upstream version 1.11.14.
+- Remove deprecated nbdkit-xz-plugin (replaced by nbdkit-xz-filter).
+
 * Tue Apr 02 2019 Richard W.M. Jones <rjones@redhat.com> - 1.11.13-1
 - New upstream version 1.11.13.
 
diff --git a/sources b/sources
index 897b56c..5c00cc8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (nbdkit-1.11.13.tar.gz) = 97a8204f5665d3a0a46a621a50e6158c852391916a73fee1fe682c4330cc9ba6cba94859d1cdc0ce5f48f11601ae11892b81efd16f6666d9828da9e5f6d95f6e
-SHA512 (nbdkit-1.11.13.tar.gz.sig) = 2bc20b83f905d02690bab64cf23373ea3cdb9f45118dd321216742d29afb48b1140bc861b60479bebc42319163931fb16f9efa69fcadf68c6da77663b6782068
+SHA512 (nbdkit-1.11.14.tar.gz) = fc3ef8ea1f925f4f97c928f6f9f1b85e3165fbd2a9de0a0a62389033e416375cb13cc91581594560a7fab11714328137970b108c69070c336ab59c835831efc4
+SHA512 (nbdkit-1.11.14.tar.gz.sig) = a280b8502070535b304302f60fc94acf9488b8a96b1ddc4a75de866e5438da58d504ef62b17ea7a61f922d6d727c660c06841721c6090d4bf9fab2d41f0c7ef9