From e60619c01d6b16a092400541ff94331d839c6761 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 27 Feb 2020 15:02:42 +0000
Subject: [PATCH 01/27] OCaml 4.10.0 final (Fedora 32).

---
 libnbd.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libnbd.spec b/libnbd.spec
index 4c69e6a..dcd0459 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -9,7 +9,7 @@
 
 Name:           libnbd
 Version:        1.3.3
-Release:        2%{?dist}
+Release:        2%{?dist}.1
 Summary:        NBD client library in userspace
 
 License:        LGPLv2+
@@ -248,6 +248,9 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
+* Thu Feb 27 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.3-2.1
+- OCaml 4.10.0 final (Fedora 32).
+
 * Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.3-2
 - OCaml 4.10.0 final.
 

From 536e109445642c0e55fa6ea5dae372d749ff44b8 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 27 Feb 2020 16:52:42 +0000
Subject: [PATCH 02/27] Bump release and rebuild.

---
 libnbd.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libnbd.spec b/libnbd.spec
index dcd0459..be74bc7 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -9,7 +9,7 @@
 
 Name:           libnbd
 Version:        1.3.3
-Release:        2%{?dist}.1
+Release:        2%{?dist}.2
 Summary:        NBD client library in userspace
 
 License:        LGPLv2+
@@ -248,6 +248,9 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
+* Thu Feb 27 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.3-2.2
+- Bump release and rebuild.
+
 * Thu Feb 27 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.3-2.1
 - OCaml 4.10.0 final (Fedora 32).
 

From c9a1c8c30de9c0859939e0aee1b408a3f5ca1b93 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 29 Feb 2020 15:26:38 +0000
Subject: [PATCH 03/27] New upstream development version 1.3.4.

(cherry picked from commit e71e650b32f9cf4df28e24bab44527dc89b6842f)
---
 libnbd.spec | 7 +++++--
 sources     | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/libnbd.spec b/libnbd.spec
index be74bc7..28cb9ad 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -8,8 +8,8 @@
 %global source_directory 1.3-development
 
 Name:           libnbd
-Version:        1.3.3
-Release:        2%{?dist}.2
+Version:        1.3.4
+Release:        1%{?dist}
 Summary:        NBD client library in userspace
 
 License:        LGPLv2+
@@ -248,6 +248,9 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
+* Sat Feb 29 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.4-1
+- New upstream development version 1.3.4.
+
 * Thu Feb 27 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.3-2.2
 - Bump release and rebuild.
 
diff --git a/sources b/sources
index 5a385ff..547085c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libnbd-1.3.3.tar.gz) = d6edf70fa754c604f3cd60bfbaf90a5dba1f7ce23eac87c538ed4dc06f126606c4e43d53d096139e30778a72cfe31f5fa5c867e395bc7ff698272e1d46a84e87
-SHA512 (libnbd-1.3.3.tar.gz.sig) = 41b30f77902bd98c2a6d6b0fcb07d5c8a0163423315d809979648a5f931d05886f0e6b8cf5125292c1460833f8388d3c60d1e1a653c6bdd55d0bf7daf8acec6c
+SHA512 (libnbd-1.3.4.tar.gz) = 017096c0de34815a519fcd2026ee85c35fda75283c5638a33d48ff96ee8976baa531e32421ed01e5d250e5011f15faef09c7a52c36ec9b42fe1dfe78ef1ace0a
+SHA512 (libnbd-1.3.4.tar.gz.sig) = f4022fd644287b2e6df9d5d2a9bbc50c0b8ac905a12ac825594d440ed4292ff0964e343002f042e02822649850335ae931b7515e71dce38c15199a51389c2535

From d9c8a67de77a36b8a8140c99afcb1c9ca46d1e65 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 10 Mar 2020 21:57:39 +0000
Subject: [PATCH 04/27] New upstream development version 1.3.5. Add new
 bash-completion subpackage.

(cherry picked from commit 84455b03d57a6e84a5f26ce8442b1884b38ce513)
---
 libnbd.spec | 27 ++++++++++++++++++++++++++-
 sources     |  4 ++--
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/libnbd.spec b/libnbd.spec
index 28cb9ad..86b007b 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -8,7 +8,7 @@
 %global source_directory 1.3-development
 
 Name:           libnbd
-Version:        1.3.4
+Version:        1.3.5
 Release:        1%{?dist}
 Summary:        NBD client library in userspace
 
@@ -49,6 +49,9 @@ BuildRequires:  ocaml-findlib-devel
 # Only for building the examples.
 BuildRequires:  glib2-devel
 
+# For bash-completion.
+BuildRequires:  bash-completion
+
 # Only for running the test suite.
 BuildRequires:  gnutls-utils
 %if 0%{?fedora} >= 31
@@ -138,6 +141,18 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 This package contains FUSE support for %{name}.
 
 
+%package bash-completion
+Summary:       Bash tab-completion for %{name}
+BuildArch:     noarch
+Requires:      bash-completion >= 2.0
+Requires:      %{name}-server = %{version}-%{release}
+
+
+%description bash-completion
+Install this package if you want intelligent bash tab-completion
+for %{name}.
+
+
 %prep
 %if 0%{verify_tarball_signature}
 %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
@@ -247,7 +262,17 @@ make %{?_smp_mflags} check || {
 %{_mandir}/man1/nbdfuse.1*
 
 
+%files bash-completion
+%dir %{_datadir}/bash-completion/completions
+%{_datadir}/bash-completion/completions/nbdfuse
+%{_datadir}/bash-completion/completions/nbdsh
+
+
 %changelog
+* Tue Mar 10 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.5-1
+- New upstream development version 1.3.5.
+- Add new bash-completion subpackage.
+
 * Sat Feb 29 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.4-1
 - New upstream development version 1.3.4.
 
diff --git a/sources b/sources
index 547085c..0b9bc05 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libnbd-1.3.4.tar.gz) = 017096c0de34815a519fcd2026ee85c35fda75283c5638a33d48ff96ee8976baa531e32421ed01e5d250e5011f15faef09c7a52c36ec9b42fe1dfe78ef1ace0a
-SHA512 (libnbd-1.3.4.tar.gz.sig) = f4022fd644287b2e6df9d5d2a9bbc50c0b8ac905a12ac825594d440ed4292ff0964e343002f042e02822649850335ae931b7515e71dce38c15199a51389c2535
+SHA512 (libnbd-1.3.5.tar.gz) = bd21e7673504a154beb44aab0d2e8b6bd325d5cb1a0f5575c5ee3e100f4539c0b32befab38514a0dfb304dc0245d885a145e8a89a9b3beffd362fee2a0bc77f2
+SHA512 (libnbd-1.3.5.tar.gz.sig) = 6718150401ea748c1575153a1c7e976cb726e5a8071f7b4553af81d42ef18ce37229005cde1c2ec04726a7b422b0cad6dc55b9fc87c85bc5284de2af7a3c9831

From f62121bd8a1ad27ba9d145f51bccb847bb30286b Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 11 Mar 2020 10:18:06 +0000
Subject: [PATCH 05/27] Fix bogus runtime Requires of new bash-completion
 package.

(cherry picked from commit 6f99e818808fcca50132686fba8f2b1bf916420b)
---
 libnbd.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libnbd.spec b/libnbd.spec
index 86b007b..b72edda 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -9,7 +9,7 @@
 
 Name:           libnbd
 Version:        1.3.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        NBD client library in userspace
 
 License:        LGPLv2+
@@ -145,7 +145,7 @@ This package contains FUSE support for %{name}.
 Summary:       Bash tab-completion for %{name}
 BuildArch:     noarch
 Requires:      bash-completion >= 2.0
-Requires:      %{name}-server = %{version}-%{release}
+Requires:      %{name}%{?_isa} = %{version}-%{release}
 
 
 %description bash-completion
@@ -269,6 +269,9 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
+* Wed Mar 11 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.5-2
+- Fix bogus runtime Requires of new bash-completion package.
+
 * Tue Mar 10 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.5-1
 - New upstream development version 1.3.5.
 - Add new bash-completion subpackage.

From 184c483dd94e702f35e9d43e00c107026950290a Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 11 Mar 2020 10:28:11 +0000
Subject: [PATCH 06/27] Remove %{?_isa} from noarch package.

(cherry picked from commit 452725e80a01b1e140aea31eae10cee5e52a77a9)
---
 libnbd.spec | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libnbd.spec b/libnbd.spec
index b72edda..4a7f9ba 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -145,7 +145,9 @@ This package contains FUSE support for %{name}.
 Summary:       Bash tab-completion for %{name}
 BuildArch:     noarch
 Requires:      bash-completion >= 2.0
-Requires:      %{name}%{?_isa} = %{version}-%{release}
+# Don't use _isa here because it's a noarch package.  This dependency
+# is just to ensure that the subpackage is updated along with libnbd.
+Requires:      %{name} = %{version}-%{release}
 
 
 %description bash-completion

From d4daf92cff7707f36ab4cfa469211b892dbe7ddd Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 31 Mar 2020 18:55:52 +0100
Subject: [PATCH 07/27] New upstream development version 1.3.6. Golang bindings
 are contained in this release but not distributed.

(cherry picked from commit d80bb85d984fc5cd77feda794443b8576137422e)
---
 libnbd.spec | 14 +++++++++++---
 sources     |  4 ++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/libnbd.spec b/libnbd.spec
index 4a7f9ba..a91829f 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -8,8 +8,8 @@
 %global source_directory 1.3-development
 
 Name:           libnbd
-Version:        1.3.5
-Release:        2%{?dist}
+Version:        1.3.6
+Release:        1%{?dist}
 Summary:        NBD client library in userspace
 
 License:        LGPLv2+
@@ -172,7 +172,8 @@ autoreconf -i
     PYTHON=%{__python3} \
     --enable-python \
     --enable-ocaml \
-    --enable-fuse
+    --enable-fuse \
+    --disable-golang
 
 make %{?_smp_mflags}
 
@@ -183,6 +184,9 @@ make %{?_smp_mflags}
 # Delete libtool crap.
 find $RPM_BUILD_ROOT -name '*.la' -delete
 
+# Delete the golang man page since we're not distributing the bindings.
+rm $RPM_BUILD_ROOT%{_mandir}/man3/libnbd-golang.3*
+
 
 %check
 # interop/structured-read.sh fails with the old qemu-nbd in Fedora 29,
@@ -271,6 +275,10 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
+* Tue Mar 31 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.6-1
+- New upstream development version 1.3.6.
+- Golang bindings are contained in this release but not distributed.
+
 * Wed Mar 11 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.5-2
 - Fix bogus runtime Requires of new bash-completion package.
 
diff --git a/sources b/sources
index 0b9bc05..4c27f4f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libnbd-1.3.5.tar.gz) = bd21e7673504a154beb44aab0d2e8b6bd325d5cb1a0f5575c5ee3e100f4539c0b32befab38514a0dfb304dc0245d885a145e8a89a9b3beffd362fee2a0bc77f2
-SHA512 (libnbd-1.3.5.tar.gz.sig) = 6718150401ea748c1575153a1c7e976cb726e5a8071f7b4553af81d42ef18ce37229005cde1c2ec04726a7b422b0cad6dc55b9fc87c85bc5284de2af7a3c9831
+SHA512 (libnbd-1.3.6.tar.gz) = 2c39b820c95cdc61aceea188d1804f4551a776487543a487bd17357b039036ca15805daf8953e9701d003b2166de305167d7fa578fd3b0fa5e6764caebe9a516
+SHA512 (libnbd-1.3.6.tar.gz.sig) = 6d8eaab14e5853c6c2ffdfbef86ca1362246bc156ac035a12777c59afc827483a65957a0c4fa82b6bc5cc2653fb2a01fe6e21497db46800d935a181cb257044b

From 13e7dba005e3e88c5ac8d60fc13871377ac6408e Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 17 Apr 2020 22:29:33 +0100
Subject: [PATCH 08/27] OCaml 4.11.0 pre-release Add upstream patch to fix one
 of the tests that fails on slow machines.

(cherry picked from commit 78c8600f66ac03e3b619c3f6c137307211bc2e1e)
---
 0001-ocaml-Fix-bug-in-asynch-copy-test.patch | 52 ++++++++++++++++++++
 libnbd.spec                                  |  8 ++-
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 0001-ocaml-Fix-bug-in-asynch-copy-test.patch

diff --git a/0001-ocaml-Fix-bug-in-asynch-copy-test.patch b/0001-ocaml-Fix-bug-in-asynch-copy-test.patch
new file mode 100644
index 0000000..d59a39b
--- /dev/null
+++ b/0001-ocaml-Fix-bug-in-asynch-copy-test.patch
@@ -0,0 +1,52 @@
+From 0475bfe04a527051c0a37af59a733c4c8554e427 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Fri, 17 Apr 2020 22:23:56 +0100
+Subject: [PATCH] ocaml: Fix bug in asynch copy test.
+
+This program had a subtle bug: If we've read everything from the
+source, but there are still source commands in flight, AND it happens
+that there are no destination commands in flight, then the loop
+finishes prematurely.  This is particularly evident when you run the
+test on a slow machine (armv7 in Koji is illustrative).  The fix is to
+check that there are no commands in flight either from the source or
+to the destination.
+
+(I actually discovered this when writing the golang bindings which
+copied from the OCaml version, but forgot to make the correction to
+the original.)
+---
+ ocaml/examples/asynch_copy.ml    | 3 ++-
+ ocaml/tests/test_590_aio_copy.ml | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/ocaml/examples/asynch_copy.ml b/ocaml/examples/asynch_copy.ml
+index d5dcc60..7132f57 100644
+--- a/ocaml/examples/asynch_copy.ml
++++ b/ocaml/examples/asynch_copy.ml
+@@ -41,7 +41,8 @@ let asynch_copy src dst =
+   (* The main loop which runs until we have finished reading and
+    * there are no more commands in flight.
+    *)
+-  while !soff < size || NBD.aio_in_flight dst > 0 do
++  while !soff < size || NBD.aio_in_flight src > 0 || NBD.aio_in_flight dst > 0
++  do
+     (* If we're able to submit more reads from the source then do so now. *)
+     if !soff < size && NBD.aio_in_flight src < max_reads_in_flight then (
+       let bs = min bs (size -^ !soff) in
+diff --git a/ocaml/tests/test_590_aio_copy.ml b/ocaml/tests/test_590_aio_copy.ml
+index ac490ef..e3cd59d 100644
+--- a/ocaml/tests/test_590_aio_copy.ml
++++ b/ocaml/tests/test_590_aio_copy.ml
+@@ -64,7 +64,8 @@ let asynch_copy src dst =
+   (* The main loop which runs until we have finished reading and
+    * there are no more commands in flight.
+    *)
+-  while !soff < size || NBD.aio_in_flight dst > 0 do
++  while !soff < size || NBD.aio_in_flight src > 0 || NBD.aio_in_flight dst > 0
++  do
+     (* If we're able to submit more reads from the source then do so now. *)
+     if !soff < size && NBD.aio_in_flight src < max_reads_in_flight then (
+       let bs = min bs (size -^ !soff) in
+-- 
+2.25.0
+
diff --git a/libnbd.spec b/libnbd.spec
index a91829f..6a503f3 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -9,7 +9,7 @@
 
 Name:           libnbd
 Version:        1.3.6
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        NBD client library in userspace
 
 License:        LGPLv2+
@@ -22,6 +22,9 @@ Source1:        http://libguestfs.org/download/libnbd/%{source_directory}/%{name
 # https://pgp.key-server.io/pks/lookup?search=rjones%40redhat.com&fingerprint=on&op=vindex
 Source2:       libguestfs.keyring
 
+# Upstream patch to fix one of the tests that fails on slow machines.
+Patch1:        0001-ocaml-Fix-bug-in-asynch-copy-test.patch
+
 %if 0%{patches_touch_autotools}
 BuildRequires: autoconf, automake, libtool
 %endif
@@ -275,6 +278,9 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
+* Fri Apr 17 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.6-4
+- Add upstream patch to fix one of the tests that fails on slow machines.
+
 * Tue Mar 31 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.6-1
 - New upstream development version 1.3.6.
 - Golang bindings are contained in this release but not distributed.

From 3f53b393082a00c9daa21e7d8aff0c4e8cd69685 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 23 Apr 2020 22:38:34 +0100
Subject: [PATCH 09/27] Fix previous incorrectly merged commit.

Remove the patch.
---
 0001-ocaml-Fix-bug-in-asynch-copy-test.patch | 52 --------------------
 libnbd.spec                                  |  3 --
 2 files changed, 55 deletions(-)
 delete mode 100644 0001-ocaml-Fix-bug-in-asynch-copy-test.patch

diff --git a/0001-ocaml-Fix-bug-in-asynch-copy-test.patch b/0001-ocaml-Fix-bug-in-asynch-copy-test.patch
deleted file mode 100644
index d59a39b..0000000
--- a/0001-ocaml-Fix-bug-in-asynch-copy-test.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 0475bfe04a527051c0a37af59a733c4c8554e427 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Fri, 17 Apr 2020 22:23:56 +0100
-Subject: [PATCH] ocaml: Fix bug in asynch copy test.
-
-This program had a subtle bug: If we've read everything from the
-source, but there are still source commands in flight, AND it happens
-that there are no destination commands in flight, then the loop
-finishes prematurely.  This is particularly evident when you run the
-test on a slow machine (armv7 in Koji is illustrative).  The fix is to
-check that there are no commands in flight either from the source or
-to the destination.
-
-(I actually discovered this when writing the golang bindings which
-copied from the OCaml version, but forgot to make the correction to
-the original.)
----
- ocaml/examples/asynch_copy.ml    | 3 ++-
- ocaml/tests/test_590_aio_copy.ml | 3 ++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/ocaml/examples/asynch_copy.ml b/ocaml/examples/asynch_copy.ml
-index d5dcc60..7132f57 100644
---- a/ocaml/examples/asynch_copy.ml
-+++ b/ocaml/examples/asynch_copy.ml
-@@ -41,7 +41,8 @@ let asynch_copy src dst =
-   (* The main loop which runs until we have finished reading and
-    * there are no more commands in flight.
-    *)
--  while !soff < size || NBD.aio_in_flight dst > 0 do
-+  while !soff < size || NBD.aio_in_flight src > 0 || NBD.aio_in_flight dst > 0
-+  do
-     (* If we're able to submit more reads from the source then do so now. *)
-     if !soff < size && NBD.aio_in_flight src < max_reads_in_flight then (
-       let bs = min bs (size -^ !soff) in
-diff --git a/ocaml/tests/test_590_aio_copy.ml b/ocaml/tests/test_590_aio_copy.ml
-index ac490ef..e3cd59d 100644
---- a/ocaml/tests/test_590_aio_copy.ml
-+++ b/ocaml/tests/test_590_aio_copy.ml
-@@ -64,7 +64,8 @@ let asynch_copy src dst =
-   (* The main loop which runs until we have finished reading and
-    * there are no more commands in flight.
-    *)
--  while !soff < size || NBD.aio_in_flight dst > 0 do
-+  while !soff < size || NBD.aio_in_flight src > 0 || NBD.aio_in_flight dst > 0
-+  do
-     (* If we're able to submit more reads from the source then do so now. *)
-     if !soff < size && NBD.aio_in_flight src < max_reads_in_flight then (
-       let bs = min bs (size -^ !soff) in
--- 
-2.25.0
-
diff --git a/libnbd.spec b/libnbd.spec
index e04f259..7fb187e 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -22,9 +22,6 @@ Source1:        http://libguestfs.org/download/libnbd/%{source_directory}/%{name
 # https://pgp.key-server.io/pks/lookup?search=rjones%40redhat.com&fingerprint=on&op=vindex
 Source2:       libguestfs.keyring
 
-# Upstream patch to fix one of the tests that fails on slow machines.
-Patch1:        0001-ocaml-Fix-bug-in-asynch-copy-test.patch
-
 %if 0%{patches_touch_autotools}
 BuildRequires: autoconf, automake, libtool
 %endif

From 70cf68113590d8f54c51827470520e1a1bd616fc Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 17 Jul 2020 11:22:33 +0100
Subject: [PATCH 10/27] New upstream version 1.3.8. New tool: nbdcopy

---
 libnbd.spec | 9 ++++++++-
 sources     | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/libnbd.spec b/libnbd.spec
index 7fb187e..6847358 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -8,7 +8,7 @@
 %global source_directory 1.3-development
 
 Name:           libnbd
-Version:        1.3.7
+Version:        1.3.8
 Release:        1%{?dist}
 Summary:        NBD client library in userspace
 
@@ -219,7 +219,9 @@ make %{?_smp_mflags} check || {
 %files
 %doc README
 %license COPYING.LIB
+%{_bindir}/nbdcopy
 %{_libdir}/libnbd.so.*
+%{_mandir}/man1/nbdcopy.1*
 
 
 %files devel
@@ -270,11 +272,16 @@ make %{?_smp_mflags} check || {
 
 %files bash-completion
 %dir %{_datadir}/bash-completion/completions
+%{_datadir}/bash-completion/completions/nbdcopy
 %{_datadir}/bash-completion/completions/nbdfuse
 %{_datadir}/bash-completion/completions/nbdsh
 
 
 %changelog
+* Fri Jul 17 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.8-1
+- New upstream version 1.3.8.
+- New tool: nbdcopy
+
 * Thu Apr 23 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.7-1
 - New upstream version 1.3.7.
 
diff --git a/sources b/sources
index add6f4a..c910683 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libnbd-1.3.7.tar.gz) = 28980a8b4200ec41a6e344ca34e3fcfb27fb7a896b93e0883709da1804b310b1dbc76e9313524934909fd1ce55f019d2fa72d7058ea8db00f44795fdaa8e33b2
-SHA512 (libnbd-1.3.7.tar.gz.sig) = fc7a13d957dbc2595301d14f45674ae700f98d50ef57577cd5ce2ce4a33df043423f9ee41e44c06637d29a0728a0a526887a33b3d3dfe8cd175a535e00836a11
+SHA512 (libnbd-1.3.8.tar.gz) = 01fb1c2a47e7db695e39de0331ca4db5e2a25a556d113e83ab5d393d6cbdfc4a1824e6add9f58a59807e92842c748c92ce37c3ea1b54468528d131139ce3d5c9
+SHA512 (libnbd-1.3.8.tar.gz.sig) = 488633083633c3e9c9ebdb91c0f69005f1ad508c9d175502bedfc3277d3f672477e62c4ed9058d5767083839739f7e6269628cb427d2ba8d6b1f551ceb559a1a

From a18a0f1ce6395bc2dd151978dec9116829aacebe Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 21 Jul 2020 11:15:24 +0100
Subject: [PATCH 11/27] New upstream version 1.3.9. New tool: nbdinfo.

(cherry picked from commit 4f792d0a40bec844b00294d1cb009fee449eb631)
---
 libnbd.spec | 9 ++++++++-
 sources     | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/libnbd.spec b/libnbd.spec
index 6847358..d20e58c 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -8,7 +8,7 @@
 %global source_directory 1.3-development
 
 Name:           libnbd
-Version:        1.3.8
+Version:        1.3.9
 Release:        1%{?dist}
 Summary:        NBD client library in userspace
 
@@ -220,8 +220,10 @@ make %{?_smp_mflags} check || {
 %doc README
 %license COPYING.LIB
 %{_bindir}/nbdcopy
+%{_bindir}/nbdinfo
 %{_libdir}/libnbd.so.*
 %{_mandir}/man1/nbdcopy.1*
+%{_mandir}/man1/nbdinfo.1*
 
 
 %files devel
@@ -274,10 +276,15 @@ make %{?_smp_mflags} check || {
 %dir %{_datadir}/bash-completion/completions
 %{_datadir}/bash-completion/completions/nbdcopy
 %{_datadir}/bash-completion/completions/nbdfuse
+%{_datadir}/bash-completion/completions/nbdinfo
 %{_datadir}/bash-completion/completions/nbdsh
 
 
 %changelog
+* Tue Jul 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.9-1
+- New upstream version 1.3.9.
+- New tool: nbdinfo.
+
 * Fri Jul 17 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.8-1
 - New upstream version 1.3.8.
 - New tool: nbdcopy
diff --git a/sources b/sources
index c910683..cd9ff07 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libnbd-1.3.8.tar.gz) = 01fb1c2a47e7db695e39de0331ca4db5e2a25a556d113e83ab5d393d6cbdfc4a1824e6add9f58a59807e92842c748c92ce37c3ea1b54468528d131139ce3d5c9
-SHA512 (libnbd-1.3.8.tar.gz.sig) = 488633083633c3e9c9ebdb91c0f69005f1ad508c9d175502bedfc3277d3f672477e62c4ed9058d5767083839739f7e6269628cb427d2ba8d6b1f551ceb559a1a
+SHA512 (libnbd-1.3.9.tar.gz) = 4af441f7d1ca0b2b5f1afdbf06af7f2c68378e3168bb2b75901ebe09dfde009ca81c314cc7fbb03516f4ddc92309aa68cb5bc4d21fd8719c155c094e80a39ff2
+SHA512 (libnbd-1.3.9.tar.gz.sig) = cf453012ee2098a6eeb5844845f4d385cebc55d3d51a4f301f7be710f8eb1babd6a45cf2e5a17cb0eb02f39a911a44faee02f5a247d1e8cc8b6652798e930e28

From 6b5abd76b32cb21502a6e378de0d835deff6c5dd Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 4 Aug 2020 17:40:26 +0100
Subject: [PATCH 12/27] New upstream version 1.3.10.

(cherry picked from commit 8b50ca5ec6d456361db5c60a61cfd355c1dd680c)
---
 libnbd.spec | 5 ++++-
 sources     | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/libnbd.spec b/libnbd.spec
index d20e58c..3845441 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -8,7 +8,7 @@
 %global source_directory 1.3-development
 
 Name:           libnbd
-Version:        1.3.9
+Version:        1.3.10
 Release:        1%{?dist}
 Summary:        NBD client library in userspace
 
@@ -281,6 +281,9 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
+* Tue Aug  4 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.10-1
+- New upstream version 1.3.10.
+
 * Tue Jul 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.9-1
 - New upstream version 1.3.9.
 - New tool: nbdinfo.
diff --git a/sources b/sources
index cd9ff07..3fe58d9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libnbd-1.3.9.tar.gz) = 4af441f7d1ca0b2b5f1afdbf06af7f2c68378e3168bb2b75901ebe09dfde009ca81c314cc7fbb03516f4ddc92309aa68cb5bc4d21fd8719c155c094e80a39ff2
-SHA512 (libnbd-1.3.9.tar.gz.sig) = cf453012ee2098a6eeb5844845f4d385cebc55d3d51a4f301f7be710f8eb1babd6a45cf2e5a17cb0eb02f39a911a44faee02f5a247d1e8cc8b6652798e930e28
+SHA512 (libnbd-1.3.10.tar.gz) = 51703d0bc4ea862e7d38d61bbed95388d30c6fbe65cad4aee3bad0309ed5a6a12b51e6087de7bc4dbadc7cbaadf0092c97513e1d21f6477babcbae4c8fc4fe55
+SHA512 (libnbd-1.3.10.tar.gz.sig) = 32849b01cb63fd43367665184b82372315eb067fdf805f00a1bca5512211639f626d4b702a8bcef542b26627b5be44ce6235e5658843c929e77129616fc03d90

From fdd890b4dd808e8932207fe6c5e78536a6b32ab5 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 6 Aug 2020 16:29:27 +0100
Subject: [PATCH 13/27] New upstream version 1.3.11.

(cherry picked from commit d0c412677dd2d0ad42377392e0a01708183b25cd)
---
 libnbd.spec | 5 ++++-
 sources     | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/libnbd.spec b/libnbd.spec
index 3845441..d13fa1a 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -8,7 +8,7 @@
 %global source_directory 1.3-development
 
 Name:           libnbd
-Version:        1.3.10
+Version:        1.3.11
 Release:        1%{?dist}
 Summary:        NBD client library in userspace
 
@@ -281,6 +281,9 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
+* Thu Aug  6 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.11-1
+- New upstream version 1.3.11.
+
 * Tue Aug  4 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.10-1
 - New upstream version 1.3.10.
 
diff --git a/sources b/sources
index 3fe58d9..af34e76 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libnbd-1.3.10.tar.gz) = 51703d0bc4ea862e7d38d61bbed95388d30c6fbe65cad4aee3bad0309ed5a6a12b51e6087de7bc4dbadc7cbaadf0092c97513e1d21f6477babcbae4c8fc4fe55
-SHA512 (libnbd-1.3.10.tar.gz.sig) = 32849b01cb63fd43367665184b82372315eb067fdf805f00a1bca5512211639f626d4b702a8bcef542b26627b5be44ce6235e5658843c929e77129616fc03d90
+SHA512 (libnbd-1.3.11.tar.gz) = e5ca8eb76697f4ae97ab0497f3f0c6496b1fa100a851b16ace798087bd2ac1cddcb96dd8b70029f4e4b0c0fb0bd5647026a38bff2a67ce277a076f4a6b97ee92
+SHA512 (libnbd-1.3.11.tar.gz.sig) = b8ee2cb470c57c7a1adecbbd9eb6095c80a08b62d1b3f6d4829018ee7d3188d2b48f9d04521de8152227f71dc1ca183eb6ffd809f99070126af7bda9fdba8d90

From dc9d3f7fdea97e14022f13e174cbaceb4297708f Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 20 Aug 2020 16:34:40 +0100
Subject: [PATCH 14/27] New upstream version 1.3.12.

(cherry picked from commit 2f5d7ec5751a6f55c701807c9ed1e30fcf7a6494)
---
 libnbd.spec | 5 ++++-
 sources     | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/libnbd.spec b/libnbd.spec
index d13fa1a..83f898d 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -8,7 +8,7 @@
 %global source_directory 1.3-development
 
 Name:           libnbd
-Version:        1.3.11
+Version:        1.3.12
 Release:        1%{?dist}
 Summary:        NBD client library in userspace
 
@@ -281,6 +281,9 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
+* Thu Aug 20 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.12-1
+- New upstream version 1.3.12.
+
 * Thu Aug  6 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.11-1
 - New upstream version 1.3.11.
 
diff --git a/sources b/sources
index af34e76..e4547ca 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libnbd-1.3.11.tar.gz) = e5ca8eb76697f4ae97ab0497f3f0c6496b1fa100a851b16ace798087bd2ac1cddcb96dd8b70029f4e4b0c0fb0bd5647026a38bff2a67ce277a076f4a6b97ee92
-SHA512 (libnbd-1.3.11.tar.gz.sig) = b8ee2cb470c57c7a1adecbbd9eb6095c80a08b62d1b3f6d4829018ee7d3188d2b48f9d04521de8152227f71dc1ca183eb6ffd809f99070126af7bda9fdba8d90
+SHA512 (libnbd-1.3.12.tar.gz) = 7b4a55b2bd31b3a851d73861e7caebd1764eb05547c953132cb94fb7898aba5c40d19d7f88b91013332ae24806f5273490f8ce2fcf885e8be29919fbaee63209
+SHA512 (libnbd-1.3.12.tar.gz.sig) = 34da1132a7a22516c2df152e77ed7d4e8cbca7383c5a77dd13173c1c5b4c5d6fb43c96fde29a125878d13cb667dc7a2caae2957dff13825f6a0e0891996f9966

From b698a0a93df90d70c41b309eb6177e8cdc597e58 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 25 Aug 2020 21:02:10 +0100
Subject: [PATCH 15/27] New stable release 1.4.0.

(cherry picked from commit 97b5eb6936a1eea242cb28021794348a845576f2)
---
 libnbd.spec | 7 +++++--
 sources     | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/libnbd.spec b/libnbd.spec
index 83f898d..f447ad6 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -5,10 +5,10 @@
 %global patches_touch_autotools %{nil}
 
 # The source directory.
-%global source_directory 1.3-development
+%global source_directory 1.4-stable
 
 Name:           libnbd
-Version:        1.3.12
+Version:        1.4.0
 Release:        1%{?dist}
 Summary:        NBD client library in userspace
 
@@ -281,6 +281,9 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
+* Tue Aug 25 2020 Richard W.M. Jones <rjones@redhat.com> - 1.4.0-1
+- New stable release 1.4.0.
+
 * Thu Aug 20 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.12-1
 - New upstream version 1.3.12.
 
diff --git a/sources b/sources
index e4547ca..cdf8cae 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libnbd-1.3.12.tar.gz) = 7b4a55b2bd31b3a851d73861e7caebd1764eb05547c953132cb94fb7898aba5c40d19d7f88b91013332ae24806f5273490f8ce2fcf885e8be29919fbaee63209
-SHA512 (libnbd-1.3.12.tar.gz.sig) = 34da1132a7a22516c2df152e77ed7d4e8cbca7383c5a77dd13173c1c5b4c5d6fb43c96fde29a125878d13cb667dc7a2caae2957dff13825f6a0e0891996f9966
+SHA512 (libnbd-1.4.0.tar.gz) = 19f4b64cb76d4dfd813c04393030a2cba4015e2e9b05c8e9becf5baad8029ff38cf5327149a28266b6af78d26740d73ccbbe2adf57c47dc53592b4f28a683330
+SHA512 (libnbd-1.4.0.tar.gz.sig) = a0303a55a45af68b5409b5be4d7e4cee5b1c74157579a3307bfd201eaf222e150a7c16b8e3b58eae5a98b645be8d9eca40b54908d42a3bacad2ab05f4b61722c

From 509151fd41071a61fb1812f24e271e7a53934316 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 2 Sep 2020 21:05:40 +0100
Subject: [PATCH 16/27] Bump release and rebuild.

---
 libnbd.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libnbd.spec b/libnbd.spec
index 8a8b657..c502bdd 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -9,7 +9,7 @@
 
 Name:           libnbd
 Version:        1.4.0
-Release:        2%{?dist}
+Release:        2%{?dist}.1
 Summary:        NBD client library in userspace
 
 License:        LGPLv2+
@@ -281,6 +281,9 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
+* Wed Sep 02 2020 Richard W.M. Jones <rjones@redhat.com> - 1.4.0-2.1
+- Bump release and rebuild.
+
 * Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 1.4.0-2
 - OCaml 4.11.1 rebuild
 

From b15097d621423eb63a43dbc66d797233f0d2835a Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 10 Sep 2020 10:28:40 +0100
Subject: [PATCH 17/27] New stable version 1.4.1.

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

diff --git a/libnbd.spec b/libnbd.spec
index c502bdd..490cd53 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -8,8 +8,8 @@
 %global source_directory 1.4-stable
 
 Name:           libnbd
-Version:        1.4.0
-Release:        2%{?dist}.1
+Version:        1.4.1
+Release:        1%{?dist}
 Summary:        NBD client library in userspace
 
 License:        LGPLv2+
@@ -281,6 +281,9 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
+* Thu Sep 10 2020 Richard W.M. Jones <rjones@redhat.com> - 1.4.1-1
+- New stable version 1.4.1.
+
 * Wed Sep 02 2020 Richard W.M. Jones <rjones@redhat.com> - 1.4.0-2.1
 - Bump release and rebuild.
 
diff --git a/sources b/sources
index cdf8cae..c12b0d8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libnbd-1.4.0.tar.gz) = 19f4b64cb76d4dfd813c04393030a2cba4015e2e9b05c8e9becf5baad8029ff38cf5327149a28266b6af78d26740d73ccbbe2adf57c47dc53592b4f28a683330
-SHA512 (libnbd-1.4.0.tar.gz.sig) = a0303a55a45af68b5409b5be4d7e4cee5b1c74157579a3307bfd201eaf222e150a7c16b8e3b58eae5a98b645be8d9eca40b54908d42a3bacad2ab05f4b61722c
+SHA512 (libnbd-1.4.1.tar.gz) = 5787fdf97a16dc35dbd628adad7953dbff034dd44fd7acf99064eae512d27107665e5fc3f990c7be139f2657a30f961be6a399aaa19aa4b15c5ee9c0df74cef3
+SHA512 (libnbd-1.4.1.tar.gz.sig) = 85cf0ef0d5e56d8cfca627eeb1a8c48e102392d96facaf2d7c79fb045c095744cc99b0cd0544acd27a47b828dbe8a8a707ebf47a0238c221497591c54c2639ed

From 6ec77bd6442139d00c14d38e20d7580a7c72e04d Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 10 Sep 2020 10:28:40 +0100
Subject: [PATCH 18/27] New stable version 1.4.1.

(cherry picked from commit b15097d621423eb63a43dbc66d797233f0d2835a)
---
 libnbd.spec | 5 ++++-
 sources     | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/libnbd.spec b/libnbd.spec
index f447ad6..1d66529 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -8,7 +8,7 @@
 %global source_directory 1.4-stable
 
 Name:           libnbd
-Version:        1.4.0
+Version:        1.4.1
 Release:        1%{?dist}
 Summary:        NBD client library in userspace
 
@@ -281,6 +281,9 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
+* Thu Sep 10 2020 Richard W.M. Jones <rjones@redhat.com> - 1.4.1-1
+- New stable version 1.4.1.
+
 * Tue Aug 25 2020 Richard W.M. Jones <rjones@redhat.com> - 1.4.0-1
 - New stable release 1.4.0.
 
diff --git a/sources b/sources
index cdf8cae..c12b0d8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libnbd-1.4.0.tar.gz) = 19f4b64cb76d4dfd813c04393030a2cba4015e2e9b05c8e9becf5baad8029ff38cf5327149a28266b6af78d26740d73ccbbe2adf57c47dc53592b4f28a683330
-SHA512 (libnbd-1.4.0.tar.gz.sig) = a0303a55a45af68b5409b5be4d7e4cee5b1c74157579a3307bfd201eaf222e150a7c16b8e3b58eae5a98b645be8d9eca40b54908d42a3bacad2ab05f4b61722c
+SHA512 (libnbd-1.4.1.tar.gz) = 5787fdf97a16dc35dbd628adad7953dbff034dd44fd7acf99064eae512d27107665e5fc3f990c7be139f2657a30f961be6a399aaa19aa4b15c5ee9c0df74cef3
+SHA512 (libnbd-1.4.1.tar.gz.sig) = 85cf0ef0d5e56d8cfca627eeb1a8c48e102392d96facaf2d7c79fb045c095744cc99b0cd0544acd27a47b828dbe8a8a707ebf47a0238c221497591c54c2639ed

From b011dda559537db245e0213605577659b42f62a8 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 11 Sep 2020 20:45:13 +0100
Subject: [PATCH 19/27] Rebuild in side tag for OCaml 4.11.1

---
 libnbd.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libnbd.spec b/libnbd.spec
index 490cd53..15541d0 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -9,7 +9,7 @@
 
 Name:           libnbd
 Version:        1.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        NBD client library in userspace
 
 License:        LGPLv2+
@@ -281,6 +281,9 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
+* Fri Sep 11 2020 Richard W.M. Jones <rjones@redhat.com> - 1.4.1-2
+- Rebuild in side tag for OCaml 4.11.1
+
 * Thu Sep 10 2020 Richard W.M. Jones <rjones@redhat.com> - 1.4.1-1
 - New stable version 1.4.1.
 

From 511060422d6e10e6a7004ca4de2f09348a945609 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 11 Sep 2020 20:45:59 +0100
Subject: [PATCH 20/27] Make sure version < Rawhide.

---
 libnbd.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libnbd.spec b/libnbd.spec
index 15541d0..06845c7 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -9,7 +9,7 @@
 
 Name:           libnbd
 Version:        1.4.1
-Release:        2%{?dist}
+Release:        1%{?dist}.1
 Summary:        NBD client library in userspace
 
 License:        LGPLv2+
@@ -281,7 +281,7 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
-* Fri Sep 11 2020 Richard W.M. Jones <rjones@redhat.com> - 1.4.1-2
+* Fri Sep 11 2020 Richard W.M. Jones <rjones@redhat.com> - 1.4.1-1.fc33.1
 - Rebuild in side tag for OCaml 4.11.1
 
 * Thu Sep 10 2020 Richard W.M. Jones <rjones@redhat.com> - 1.4.1-1

From 86b44caab7b3075c44a2ed96744906f13cd86ba4 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 26 Sep 2020 20:26:30 +0100
Subject: [PATCH 21/27] Rebuild for OCaml 4.11.1 in Fedora 33.

---
 libnbd.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libnbd.spec b/libnbd.spec
index 06845c7..ef917e4 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -9,7 +9,7 @@
 
 Name:           libnbd
 Version:        1.4.1
-Release:        1%{?dist}.1
+Release:        2%{?dist}.1
 Summary:        NBD client library in userspace
 
 License:        LGPLv2+
@@ -281,6 +281,9 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
+* Sat Sep 26 2020 Richard W.M. Jones <rjones@redhat.com> - 1.4.1-2.1
+- Rebuild for OCaml 4.11.1 in Fedora 33.
+
 * Fri Sep 11 2020 Richard W.M. Jones <rjones@redhat.com> - 1.4.1-1.fc33.1
 - Rebuild in side tag for OCaml 4.11.1
 

From b66d579e9f7e6f9892846f55eadaff854d3a688d Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 12 Dec 2020 21:44:23 +0000
Subject: [PATCH 22/27] New stable version 1.4.2.

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

diff --git a/libnbd.spec b/libnbd.spec
index ef917e4..186bbdb 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -8,8 +8,8 @@
 %global source_directory 1.4-stable
 
 Name:           libnbd
-Version:        1.4.1
-Release:        2%{?dist}.1
+Version:        1.4.2
+Release:        1%{?dist}
 Summary:        NBD client library in userspace
 
 License:        LGPLv2+
@@ -281,6 +281,9 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
+* Sat Dec 12 2020 Richard W.M. Jones <rjones@redhat.com> - 1.4.2-1
+- New stable version 1.4.2.
+
 * Sat Sep 26 2020 Richard W.M. Jones <rjones@redhat.com> - 1.4.1-2.1
 - Rebuild for OCaml 4.11.1 in Fedora 33.
 
diff --git a/sources b/sources
index c12b0d8..c471f98 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libnbd-1.4.1.tar.gz) = 5787fdf97a16dc35dbd628adad7953dbff034dd44fd7acf99064eae512d27107665e5fc3f990c7be139f2657a30f961be6a399aaa19aa4b15c5ee9c0df74cef3
-SHA512 (libnbd-1.4.1.tar.gz.sig) = 85cf0ef0d5e56d8cfca627eeb1a8c48e102392d96facaf2d7c79fb045c095744cc99b0cd0544acd27a47b828dbe8a8a707ebf47a0238c221497591c54c2639ed
+SHA512 (libnbd-1.4.2.tar.gz) = c8ec95b0bc72ff401fbf8072758513cce601dfa542b5165a19fcb21cee5548db31b567514a8ee6313d9aa5f0170c508bacc82391542bf497b6c5db461b0c8956
+SHA512 (libnbd-1.4.2.tar.gz.sig) = 58109d0d68ee77068873c70b75e8f0686bd71c0e17e3e197bafa0e192bf410565acbe351da46cf270e2506c37760fd853811647b4249439cabb2c52ae5c58e0a

From eb61dcd55592db1b88c5d00c8549dcabd74d89d3 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 12 Dec 2020 21:44:23 +0000
Subject: [PATCH 23/27] New stable version 1.4.2.

(cherry picked from commit b66d579e9f7e6f9892846f55eadaff854d3a688d)
---
 libnbd.spec | 5 ++++-
 sources     | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/libnbd.spec b/libnbd.spec
index 1d66529..ec5a99c 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -8,7 +8,7 @@
 %global source_directory 1.4-stable
 
 Name:           libnbd
-Version:        1.4.1
+Version:        1.4.2
 Release:        1%{?dist}
 Summary:        NBD client library in userspace
 
@@ -281,6 +281,9 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
+* Sat Dec 12 2020 Richard W.M. Jones <rjones@redhat.com> - 1.4.2-1
+- New stable version 1.4.2.
+
 * Thu Sep 10 2020 Richard W.M. Jones <rjones@redhat.com> - 1.4.1-1
 - New stable version 1.4.1.
 
diff --git a/sources b/sources
index c12b0d8..c471f98 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libnbd-1.4.1.tar.gz) = 5787fdf97a16dc35dbd628adad7953dbff034dd44fd7acf99064eae512d27107665e5fc3f990c7be139f2657a30f961be6a399aaa19aa4b15c5ee9c0df74cef3
-SHA512 (libnbd-1.4.1.tar.gz.sig) = 85cf0ef0d5e56d8cfca627eeb1a8c48e102392d96facaf2d7c79fb045c095744cc99b0cd0544acd27a47b828dbe8a8a707ebf47a0238c221497591c54c2639ed
+SHA512 (libnbd-1.4.2.tar.gz) = c8ec95b0bc72ff401fbf8072758513cce601dfa542b5165a19fcb21cee5548db31b567514a8ee6313d9aa5f0170c508bacc82391542bf497b6c5db461b0c8956
+SHA512 (libnbd-1.4.2.tar.gz.sig) = 58109d0d68ee77068873c70b75e8f0686bd71c0e17e3e197bafa0e192bf410565acbe351da46cf270e2506c37760fd853811647b4249439cabb2c52ae5c58e0a

From e25c83b33b64e38e463a2ee229689d558f86668c Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 9 Jan 2021 18:40:58 +0000
Subject: [PATCH 24/27] Fix bogus year in changelog.

(cherry picked from commit 184572b10fbe56a9f5d0711eff5aa580aae53887)
---
 libnbd.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libnbd.spec b/libnbd.spec
index 8ad6ef0..402ec58 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -292,7 +292,7 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
-* Thu Jan 07 2020 Richard W.M. Jones <rjones@redhat.com> - 1.6.0-1
+* Thu Jan 07 2021 Richard W.M. Jones <rjones@redhat.com> - 1.6.0-1
 - New upstream development version 1.6.0.
 
 * Sat Dec 12 2020 Richard W.M. Jones <rjones@redhat.com> - 1.4.2-1

From fb3c10f728e24a9b92e7abacd6b4915a55a2730f Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 20 Jan 2021 13:31:51 +0000
Subject: [PATCH 25/27] New upstream stable version 1.6.1.

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

diff --git a/libnbd.spec b/libnbd.spec
index 402ec58..6be2133 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -8,7 +8,7 @@
 %global source_directory 1.6-stable
 
 Name:           libnbd
-Version:        1.6.0
+Version:        1.6.1
 Release:        1%{?dist}
 Summary:        NBD client library in userspace
 
@@ -292,8 +292,11 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
+* Wed Jan 20 2021 Richard W.M. Jones <rjones@redhat.com> - 1.6.1-1
+- New upstream stable version 1.6.1.
+
 * Thu Jan 07 2021 Richard W.M. Jones <rjones@redhat.com> - 1.6.0-1
-- New upstream development version 1.6.0.
+- New upstream stable version 1.6.0.
 
 * Sat Dec 12 2020 Richard W.M. Jones <rjones@redhat.com> - 1.4.2-1
 - New stable version 1.4.2.
diff --git a/sources b/sources
index 4925abf..59c1752 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libnbd-1.6.0.tar.gz) = 4bdd8a52bef6fb136bbb4034cd4521952e1a634334ed193e4883e4bf93baa59b01439135527a4cfeaa3ae9cb92ae70a330d93156666b86c048469c1f5b74ce5f
-SHA512 (libnbd-1.6.0.tar.gz.sig) = e487ceece815b4e77a1a5977c6f8173599e12478514f0f014b1ffa7e69467411dbdb77c4b2f16aca5e4fa0f1bac35ab7f57e591db6af085d5e87b21448958c69
+SHA512 (libnbd-1.6.1.tar.gz) = 8a8acf9f0abbe44098dcbd425526c46bc2c75a4c1e9e6e6c874cf42f875fcd0fe41a43ebfc8718babbc56825bafbf25d6b47f865003eb1779ab37e8d72725919
+SHA512 (libnbd-1.6.1.tar.gz.sig) = a2358d133637face6fa75020fa2162a231762c2047e7b24fd22a54020f96ec3e0c7e568d94a82b030520ad90db1ad4f29dee9197ad5685b651d03dfc8634981b

From 0943b0aed7ec48481e64740199dd32b74365a6a3 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 21 Jan 2021 16:26:59 +0000
Subject: [PATCH 26/27] Drop BR nbdkit-sparse-random-plugin.

Only needed to run a small part of the test suite, and it's
not available in F32.
---
 libnbd.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libnbd.spec b/libnbd.spec
index 99b58a9..0a172d4 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -69,7 +69,6 @@ BuildRequires:  nbdkit-memory-plugin
 BuildRequires:  nbdkit-null-plugin
 BuildRequires:  nbdkit-pattern-plugin
 BuildRequires:  nbdkit-sh-plugin
-BuildRequires:  nbdkit-sparse-random-plugin
 BuildRequires:  nbd
 BuildRequires:  qemu-img
 BuildRequires:  util-linux

From 411ebcec072c9597d8fc1817f8caa35e1fc971b5 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 2 Mar 2021 22:03:49 +0000
Subject: [PATCH 27/27] New upstream version 1.6.2.

(cherry picked from commit b4dd480e4b8570ae611440bcc7f5c5dc7575f683)
---
 libnbd.spec | 5 ++++-
 sources     | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/libnbd.spec b/libnbd.spec
index 0a172d4..55b71f6 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -8,7 +8,7 @@
 %global source_directory 1.6-stable
 
 Name:           libnbd
-Version:        1.6.1
+Version:        1.6.2
 Release:        1%{?dist}
 Summary:        NBD client library in userspace
 
@@ -291,6 +291,9 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
+* Tue Mar  2 2021 Richard W.M. Jones <rjones@redhat.com> - 1.6.2-1
+- New upstream version 1.6.2.
+
 * Wed Jan 20 2021 Richard W.M. Jones <rjones@redhat.com> - 1.6.1-1
 - New upstream stable version 1.6.1.
 
diff --git a/sources b/sources
index 59c1752..7a3a717 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libnbd-1.6.1.tar.gz) = 8a8acf9f0abbe44098dcbd425526c46bc2c75a4c1e9e6e6c874cf42f875fcd0fe41a43ebfc8718babbc56825bafbf25d6b47f865003eb1779ab37e8d72725919
-SHA512 (libnbd-1.6.1.tar.gz.sig) = a2358d133637face6fa75020fa2162a231762c2047e7b24fd22a54020f96ec3e0c7e568d94a82b030520ad90db1ad4f29dee9197ad5685b651d03dfc8634981b
+SHA512 (libnbd-1.6.2.tar.gz) = c9c68ae615e8e6f7db1833ed3778e7a07c4d36e3e370ef9fe824e773f04f176a5eb9e29396b5bab536f6ec9985843d6e99db8818621cf0f5197368b29872dd5a
+SHA512 (libnbd-1.6.2.tar.gz.sig) = 051bcfb839768e782f3ead9bf2b452138f74fcb242dddd41c8d6bc4579eb21347331629b7b77c2e3c73cc20958f8f2f3165615eb31e6a99d46fa5102a5bbdfae