From 3d8e2fc142a2f049e87805e464f26aa4bca8b7d3 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 1 Mar 2019 18:49:42 +0000
Subject: [PATCH] New upstream version 1.11.6.

- Add linuxdisk plugin.
- Remove rust plugin if compiled.
---
 nbdkit.spec | 33 +++++++++++++++++++++++++++++++--
 sources     |  4 ++--
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/nbdkit.spec b/nbdkit.spec
index 4c4ed6c..9b9608b 100644
--- a/nbdkit.spec
+++ b/nbdkit.spec
@@ -31,7 +31,7 @@
 %global source_directory 1.11-development
 
 Name:           nbdkit
-Version:        1.11.5
+Version:        1.11.6
 Release:        1%{?dist}
 Summary:        NBD server
 
@@ -72,7 +72,7 @@ BuildRequires:  libvirt-devel
 BuildRequires:  xz-devel
 BuildRequires:  zlib-devel
 BuildRequires:  libcurl-devel
-BuildRequires:  e2fsprogs-devel
+BuildRequires:  e2fsprogs, e2fsprogs-devel
 BuildRequires:  genisoimage
 BuildRequires:  bash-completion
 BuildRequires:  perl-devel
@@ -297,6 +297,19 @@ virDomainBlockPeek API.
 %endif
 
 
+%package linuxdisk-plugin
+Summary:        Virtual Linux disk plugin for %{name}
+License:        BSD
+
+Requires:       %{name}-server%{?_isa} = %{version}-%{release}
+# for mke2fs
+Requires:       e2fsprogs
+
+
+%description linuxdisk-plugin
+This package is a virtual Linux disk plugin for %{name}.
+
+
 %package lua-plugin
 Summary:        Lua plugin for %{name}
 License:        BSD
@@ -668,6 +681,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/nbdkit-vddk-plugin.so
 rm $RPM_BUILD_ROOT%{_mandir}/man1/nbdkit-vddk-plugin.1*
 %endif
 
+# If cargo happens to be installed on the machine then the
+# rust plugin is built.  Delete it if this happens.
+rm -f $RPM_BUILD_ROOT%{_mandir}/man3/nbdkit-rust-plugin.3*
+
 
 %check
 # Workaround for broken libvirt (RHBZ#1138604).
@@ -817,6 +834,13 @@ popd
 %endif
 
 
+%files linuxdisk-plugin
+%doc README
+%license LICENSE
+%{_libdir}/%{name}/plugins/nbdkit-linuxdisk-plugin.so
+%{_mandir}/man1/nbdkit-linuxdisk-plugin.1*
+
+
 %files lua-plugin
 %doc README
 %license LICENSE
@@ -959,6 +983,11 @@ popd
 
 
 %changelog
+* Fri Mar 01 2019 Richard W.M. Jones <rjones@redhat.com> - 1.11.6-1
+- New upstream version 1.11.6.
+- Add linuxdisk plugin.
+- Remove rust plugin if compiled.
+
 * Tue Feb 05 2019 Richard W.M. Jones <rjones@redhat.com> - 1.11.5-1
 - New upstream version 1.11.5.
 
diff --git a/sources b/sources
index 74aca9c..914e80c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (nbdkit-1.11.5.tar.gz) = 378e5c199344094d6018ab069eef9d6a8c654bc4256b5ca5ba7f196458a795854c84202d22d70ebb4d740e1b87a5923005d48045f812f479e0bf1a4330170796
-SHA512 (nbdkit-1.11.5.tar.gz.sig) = 3e9366cf2eca2c90a82791a62164f5c66ce5c99875351a551f052230c25d8155bb2e833123721c2bfa3199eef9f1258e37ff74baa5a73ea00af101926be3612e
+SHA512 (nbdkit-1.11.6.tar.gz) = 2262533796a13f3097f2e892ef06122505810f8f7fb7b19d6e9b0aed0b612228181ea31048f6f818195b7cded4669948ca3ef74fca3e245661eee4cccfeb5276
+SHA512 (nbdkit-1.11.6.tar.gz.sig) = ec33f8cc713144309a9f0a517a278122f58daac7c43051c4d6f8fc73eac2f8aa12cc29f52e5886650e5c51c603bde0a8d3eab241d986845921144568f550c65f