From d92b1f1ae5f3dbcdc25dcaa1c9c3b424b3232829 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 12 Oct 2019 21:39:25 +0100
Subject: [PATCH] New upstream version 1.1.5. New tool and subpackage nbdfuse.

---
 libnbd.spec | 29 ++++++++++++++++++++++++++---
 sources     |  4 ++--
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/libnbd.spec b/libnbd.spec
index 29ebdb1..7373b5a 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -8,7 +8,7 @@
 %global source_directory 1.1-development
 
 Name:           libnbd
-Version:        1.1.4
+Version:        1.1.5
 Release:        1%{?dist}
 Summary:        NBD client library in userspace
 
@@ -36,6 +36,9 @@ BuildRequires:  /usr/bin/pod2man
 BuildRequires:  gnutls-devel
 BuildRequires:  libxml2-devel
 
+# For nbdfuse.
+BuildRequires:  fuse, fuse-devel
+
 # For the Python 3 bindings.
 BuildRequires:  python3-devel
 
@@ -125,6 +128,16 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 python3-%{name} contains Python 3 bindings for %{name}.
 
 
+%package -n nbdfuse
+Summary:        FUSE support for %{name}
+License:        LGPLv2+ and BSD
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+
+%description -n nbdfuse
+This package contains FUSE support for %{name}.
+
+
 %prep
 %if 0%{verify_tarball_signature}
 tmphome="$(mktemp -d)"
@@ -142,7 +155,8 @@ autoreconf -i
     --with-tls-priority=@LIBNBD,SYSTEM \
     PYTHON=%{__python3} \
     --enable-python \
-    --enable-ocaml
+    --enable-ocaml \
+    --enable-fuse
 
 make %{?_smp_mflags}
 
@@ -219,9 +233,18 @@ make %{?_smp_mflags} check || {
 %{_mandir}/man1/nbdsh.1*
 
 
+%files -n nbdfuse
+%{_bindir}/nbdfuse
+%{_mandir}/man1/nbdfuse.1*
+
+
 %changelog
+* Sat Oct 12 2019 Richard W.M. Jones <rjones@redhat.com> - 1.1.5-1
+- New upstream version 1.1.5.
+- New tool and subpackage nbdfuse.
+
 * Wed Oct  9 2019 Richard W.M. Jones <rjones@redhat.com> - 1.1.4-1
-- New upstream version 1.0.3.
+- New upstream version 1.1.4.
 - Contains fix for remote code execution vulnerability.
 - Add new libnbd-security(3) man page.
 
diff --git a/sources b/sources
index 9995267..f0c3331 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libnbd-1.1.4.tar.gz) = e8a448bfada750071b1b31d80c2b0ff5ebbaf02cfe623b5613bd165947cd598cdf30914071229a150b1deda2edfe796d1b9036ec2624c5b12d0027741c85730a
-SHA512 (libnbd-1.1.4.tar.gz.sig) = f6395807f93216419b0f31c884a14053d65e547e500afc4d88fdcb12e276309da915998dc8f6cb2df440423055f324406a1db5b7c78280b8900e12ccf4690db2
+SHA512 (libnbd-1.1.5.tar.gz) = db66e2cd12eec4cb73916c89662262847e349495f057e0240578065635c38ce78b3d5261e1f5c529c6b76addb3e3a664b55073a8becd8febc989dbcc90d2d2c4
+SHA512 (libnbd-1.1.5.tar.gz.sig) = d0d1185ebc20e5512196ab15e750c0ebfbedcbc727464756745ae5c66dfa3d8d91e3943dc48b2b85c4d386a25b80f426ff3a0b15a090d0a55a76c30a31108564