The package rpms/libnbd.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/libnbd.git/commit/?id=38a64717ae8....
Change:
+%ifarch aarch64 ppc64 ppc64le riscv64 s390x x86_64
Thanks.
Full change:
============
commit 33ebe50e05db64b3d2c821876fcbab8a6d85ac7b
Merge: f4bc154 b698a0a
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Tue Aug 25 21:06:18 2020 +0100
Merge remote-tracking branch 'origin/f32' into f31
diff --cc libnbd.spec
index f6b211a,f447ad6..b91fd67
--- a/libnbd.spec
+++ b/libnbd.spec
@@@ -247,22 -272,110 +272,110 @@@ make %{?_smp_mflags} check ||
%{_mandir}/man1/nbdfuse.1*
+ %files bash-completion
+ %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
- * Thu Apr 23 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.2.3-1
- - New stable release 1.2.3.
+ * Tue Aug 25 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.4.0-1
+ - New stable release 1.4.0.
+
+ * Thu Aug 20 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.12-1
+ - New upstream version 1.3.12.
+
+ * Thu Aug 6 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.11-1
+ - New upstream version 1.3.11.
+
+ * Tue Aug 4 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.10-1
+ - New upstream version 1.3.10.
+
+ * Tue Jul 21 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.9-1
+ - New upstream version 1.3.9.
+ - New tool: nbdinfo.
+
+ * Fri Jul 17 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.8-1
+ - New upstream version 1.3.8.
+ - New tool: nbdcopy
+
+ * Thu Apr 23 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.7-1
+ - New upstream version 1.3.7.
+
+ * Fri Apr 17 2020 Richard W.M. Jones <rjones(a)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(a)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(a)redhat.com> - 1.3.5-2
+ - Fix bogus runtime Requires of new bash-completion package.
+
+ * Tue Mar 10 2020 Richard W.M. Jones <rjones(a)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(a)redhat.com> - 1.3.4-1
+ - New upstream development version 1.3.4.
+
+ * Thu Feb 27 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.3-2.2
+ - Bump release and rebuild.
+
+ * Thu Feb 27 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.3-2.1
+ - OCaml 4.10.0 final (Fedora 32).
+
+ * Wed Feb 26 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.3-2
+ - OCaml 4.10.0 final.
+
+ * Wed Feb 05 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.3-1
+ - New upstream development version 1.3.3.
+
+ * Thu Jan 30 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.2-1
+ - New upstream development version 1.3.2.
+
+ * Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3.1-5
+ - Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+ * Sun Jan 19 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.1-4
+ - Bump release and rebuild.
+
+ * Sun Jan 19 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.1-3
+ - OCaml 4.10.0+beta1 rebuild.
+
+ * Thu Dec 12 2019 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.1-2
+ - Rebuild for OCaml 4.09.0.
+
+ * Tue Dec 03 2019 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.1-1
+ - New upstream development version 1.3.1.
+
+ * Wed Nov 27 2019 Richard W.M. Jones <rjones(a)redhat.com> - 1.2.0-2
+ - Use gpgverify macro instead of explicit gpgv2 command.
+
+ * Thu Nov 14 2019 Richard W.M. Jones <rjones(a)redhat.com> - 1.2.0-1
+ - New stable release 1.2.0
+
+ * Sat Nov 09 2019 Richard W.M. Jones <rjones(a)redhat.com> - 1.1.9-1
+ - New upstream version 1.1.9.
+ - Add new nbdkit-release-notes-1.2(1) man page.
+
+ * Wed Nov 06 2019 Richard W.M. Jones <rjones(a)redhat.com> - 1.1.8-1
+ - New upstream version 1.1.8.
-* Thu Oct 24 2019 Richard W.M. Jones <rjones(a)redhat.com> - 1.1.7-1
-- New upstream version 1.1.7.
+* Wed Feb 05 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.2.2-1
+- New stable release 1.2.2.
-* Sat Oct 19 2019 Richard W.M. Jones <rjones(a)redhat.com> - 1.1.6-1
-- New upstream version 1.1.6.
+* Thu Nov 14 2019 Richard W.M. Jones <rjones(a)redhat.com> - 1.2.1-1
+- New stable release 1.2.1.
+- Use gpgverify macro instead of explicit gpgv2 command.
-* Sat Oct 12 2019 Richard W.M. Jones <rjones(a)redhat.com> - 1.1.5-1
-- New upstream version 1.1.5.
-- New tool and subpackage nbdfuse.
+* Thu Nov 14 2019 Richard W.M. Jones <rjones(a)redhat.com> - 1.2.0-1
+- New stable release 1.2.0.
-* Wed Oct 9 2019 Richard W.M. Jones <rjones(a)redhat.com> - 1.1.4-1
-- New upstream version 1.1.4.
+* Wed Oct 9 2019 Richard W.M. Jones <rjones(a)redhat.com> - 1.0.3-1
+- New upstream version 1.0.3.
- Contains fix for remote code execution vulnerability.
- Add new libnbd-security(3) man page.
commit b698a0a93df90d70c41b309eb6177e8cdc597e58
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Tue Aug 25 21:02:10 2020 +0100
New stable release 1.4.0.
(cherry picked from commit 97b5eb6936a1eea242cb28021794348a845576f2)
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(a)redhat.com> - 1.4.0-1
+- New stable release 1.4.0.
+
* Thu Aug 20 2020 Richard W.M. Jones <rjones(a)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
commit dc9d3f7fdea97e14022f13e174cbaceb4297708f
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Thu Aug 20 16:34:40 2020 +0100
New upstream version 1.3.12.
(cherry picked from commit 2f5d7ec5751a6f55c701807c9ed1e30fcf7a6494)
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(a)redhat.com> - 1.3.12-1
+- New upstream version 1.3.12.
+
* Thu Aug 6 2020 Richard W.M. Jones <rjones(a)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
commit fdd890b4dd808e8932207fe6c5e78536a6b32ab5
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Thu Aug 6 16:29:27 2020 +0100
New upstream version 1.3.11.
(cherry picked from commit d0c412677dd2d0ad42377392e0a01708183b25cd)
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(a)redhat.com> - 1.3.11-1
+- New upstream version 1.3.11.
+
* Tue Aug 4 2020 Richard W.M. Jones <rjones(a)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
commit 6b5abd76b32cb21502a6e378de0d835deff6c5dd
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Tue Aug 4 17:40:26 2020 +0100
New upstream version 1.3.10.
(cherry picked from commit 8b50ca5ec6d456361db5c60a61cfd355c1dd680c)
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(a)redhat.com> - 1.3.10-1
+- New upstream version 1.3.10.
+
* Tue Jul 21 2020 Richard W.M. Jones <rjones(a)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
commit a18a0f1ce6395bc2dd151978dec9116829aacebe
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Tue Jul 21 11:15:24 2020 +0100
New upstream version 1.3.9.
New tool: nbdinfo.
(cherry picked from commit 4f792d0a40bec844b00294d1cb009fee449eb631)
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(a)redhat.com> - 1.3.9-1
+- New upstream version 1.3.9.
+- New tool: nbdinfo.
+
* Fri Jul 17 2020 Richard W.M. Jones <rjones(a)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
commit 70cf68113590d8f54c51827470520e1a1bd616fc
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Fri Jul 17 11:22:33 2020 +0100
New upstream version 1.3.8.
New tool: nbdcopy
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(a)redhat.com> - 1.3.8-1
+- New upstream version 1.3.8.
+- New tool: nbdcopy
+
* Thu Apr 23 2020 Richard W.M. Jones <rjones(a)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
commit 3f53b393082a00c9daa21e7d8aff0c4e8cd69685
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Thu Apr 23 22:38:34 2020 +0100
Fix previous incorrectly merged commit.
Remove the 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(a)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&finge...
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
commit d234625e816084c4dc40fc1fded35f81ab39a89f
Merge: 13e7dba 488d479
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Thu Apr 23 22:23:33 2020 +0100
Merge remote-tracking branch 'origin/master' into f32
diff --cc libnbd.spec
index 6a503f3,0cc336f..e04f259
--- a/libnbd.spec
+++ b/libnbd.spec
@@@ -278,9 -279,19 +278,12 @@@ make %{?_smp_mflags} check ||
%changelog
+ * Thu Apr 23 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.7-1
+ - New upstream version 1.3.7.
+
-* Tue Apr 21 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.6-5
-- OCaml 4.11.0 pre-release attempt 2
-
* Fri Apr 17 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.6-4
-- OCaml 4.11.0 pre-release
- Add upstream patch to fix one of the tests that fails on slow machines.
-* Thu Apr 02 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.6-2
-- Update all OCaml dependencies for RPM 4.16.
-
* Tue Mar 31 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.6-1
- New upstream development version 1.3.6.
- Golang bindings are contained in this release but not distributed.
commit 488d479179c53efa9e1c03ea695ebdc6bfb12b09
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Thu Apr 23 22:18:55 2020 +0100
New upstream version 1.3.7.
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(a)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 43cdbe9..0cc336f 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -8,8 +8,8 @@
%global source_directory 1.3-development
Name: libnbd
-Version: 1.3.6
-Release: 5%{?dist}
+Version: 1.3.7
+Release: 1%{?dist}
Summary: NBD client library in userspace
License: LGPLv2+
@@ -22,9 +22,6 @@ Source1:
http://libguestfs.org/download/libnbd/%{source_directory}/%{name
#
https://pgp.key-server.io/pks/lookup?search=rjones%40redhat.com&finge...
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
@@ -282,6 +279,9 @@ make %{?_smp_mflags} check || {
%changelog
+* Thu Apr 23 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.7-1
+- New upstream version 1.3.7.
+
* Tue Apr 21 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.6-5
- OCaml 4.11.0 pre-release attempt 2
diff --git a/sources b/sources
index 4c27f4f..add6f4a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libnbd-1.3.6.tar.gz) =
2c39b820c95cdc61aceea188d1804f4551a776487543a487bd17357b039036ca15805daf8953e9701d003b2166de305167d7fa578fd3b0fa5e6764caebe9a516
-SHA512 (libnbd-1.3.6.tar.gz.sig) =
6d8eaab14e5853c6c2ffdfbef86ca1362246bc156ac035a12777c59afc827483a65957a0c4fa82b6bc5cc2653fb2a01fe6e21497db46800d935a181cb257044b
+SHA512 (libnbd-1.3.7.tar.gz) =
28980a8b4200ec41a6e344ca34e3fcfb27fb7a896b93e0883709da1804b310b1dbc76e9313524934909fd1ce55f019d2fa72d7058ea8db00f44795fdaa8e33b2
+SHA512 (libnbd-1.3.7.tar.gz.sig) =
fc7a13d957dbc2595301d14f45674ae700f98d50ef57577cd5ce2ce4a33df043423f9ee41e44c06637d29a0728a0a526887a33b3d3dfe8cd175a535e00836a11
commit 7708b43ae15af378d5b164a6447f4a8e87bb6f8a
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Tue Apr 21 16:48:43 2020 +0100
OCaml 4.11.0 pre-release attempt 2
diff --git a/libnbd.spec b/libnbd.spec
index ce034a2..43cdbe9 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -9,7 +9,7 @@
Name: libnbd
Version: 1.3.6
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: NBD client library in userspace
License: LGPLv2+
@@ -282,6 +282,9 @@ make %{?_smp_mflags} check || {
%changelog
+* Tue Apr 21 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.6-5
+- OCaml 4.11.0 pre-release attempt 2
+
* Fri Apr 17 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.6-4
- OCaml 4.11.0 pre-release
- Add upstream patch to fix one of the tests that fails on slow machines.
commit 38a64717ae864c997e1070a9059ab8d9f9e2dfb9
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Fri Apr 17 23:10:40 2020 +0100
Disable tests on 32 bit because:
https://github.com/ocaml/ocaml/issues/9460
diff --git a/libnbd.spec b/libnbd.spec
index 529fcde..ce034a2 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -209,6 +209,9 @@ for f in fuse/test-*.sh; do
chmod +x $f
done
+# Disable the tests on 32 bit because:
+#
https://github.com/ocaml/ocaml/issues/9460
+%ifarch aarch64 ppc64 ppc64le riscv64 s390x x86_64
make %{?_smp_mflags} check || {
for f in $(find -name test-suite.log); do
echo
@@ -217,6 +220,7 @@ make %{?_smp_mflags} check || {
done
exit 1
}
+%endif
%files
commit 2ab58018c83969a5808e61c537e52151f62e8531
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Fri Apr 17 22:31:16 2020 +0100
Fix changelog.
diff --git a/libnbd.spec b/libnbd.spec
index ff4f05d..529fcde 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -278,7 +278,7 @@ make %{?_smp_mflags} check || {
%changelog
-* Fri Apr 17 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.6-3
+* Fri Apr 17 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.6-4
- OCaml 4.11.0 pre-release
- Add upstream patch to fix one of the tests that fails on slow machines.
commit 13e7dba005e3e88c5ac8d60fc13871377ac6408e
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Fri Apr 17 22:29:33 2020 +0100
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)
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(a)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&finge...
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(a)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(a)redhat.com> - 1.3.6-1
- New upstream development version 1.3.6.
- Golang bindings are contained in this release but not distributed.
commit 78c8600f66ac03e3b619c3f6c137307211bc2e1e
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Fri Apr 17 22:29:33 2020 +0100
OCaml 4.11.0 pre-release
Add upstream patch to fix one of the tests that fails on slow machines.
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(a)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 7cde48c..ff4f05d 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -9,7 +9,7 @@
Name: libnbd
Version: 1.3.6
-Release: 3%{?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&finge...
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
@@ -277,6 +280,7 @@ make %{?_smp_mflags} check || {
%changelog
* Fri Apr 17 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.6-3
- OCaml 4.11.0 pre-release
+- Add upstream patch to fix one of the tests that fails on slow machines.
* Thu Apr 02 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.6-2
- Update all OCaml dependencies for RPM 4.16.
commit 7278e9942f4c040b2a056b2acbd0a4da92b5bf24
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Fri Apr 17 21:22:44 2020 +0100
OCaml 4.11.0 pre-release
diff --git a/libnbd.spec b/libnbd.spec
index 3244544..7cde48c 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -9,7 +9,7 @@
Name: libnbd
Version: 1.3.6
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NBD client library in userspace
License: LGPLv2+
@@ -275,6 +275,9 @@ make %{?_smp_mflags} check || {
%changelog
+* Fri Apr 17 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.6-3
+- OCaml 4.11.0 pre-release
+
* Thu Apr 02 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.6-2
- Update all OCaml dependencies for RPM 4.16.
commit 03954e70dfa114e482b9309f43ed624bb127dbe9
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Thu Apr 2 14:05:47 2020 +0100
Update all OCaml dependencies for RPM 4.16.
diff --git a/libnbd.spec b/libnbd.spec
index 2a669a6..3244544 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -9,7 +9,7 @@
Name: libnbd
Version: 1.3.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NBD client library in userspace
License: LGPLv2+
@@ -275,6 +275,9 @@ make %{?_smp_mflags} check || {
%changelog
+* Thu Apr 02 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.6-2
+- Update all OCaml dependencies for RPM 4.16.
+
* Tue Mar 31 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.6-1
- New upstream development version 1.3.6.
- Golang bindings are contained in this release but not distributed.
commit d4daf92cff7707f36ab4cfa469211b892dbe7ddd
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Tue Mar 31 18:55:52 2020 +0100
New upstream development version 1.3.6.
Golang bindings are contained in this release but not distributed.
(cherry picked from commit d80bb85d984fc5cd77feda794443b8576137422e)
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(a)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(a)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
commit d80bb85d984fc5cd77feda794443b8576137422e
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Tue Mar 31 18:55:52 2020 +0100
New upstream development version 1.3.6.
Golang bindings are contained in this release but not distributed.
diff --git a/libnbd.spec b/libnbd.spec
index 180bf51..2a669a6 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(a)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(a)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
commit 184c483dd94e702f35e9d43e00c107026950290a
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Wed Mar 11 10:28:11 2020 +0000
Remove %{?_isa} from noarch package.
(cherry picked from commit 452725e80a01b1e140aea31eae10cee5e52a77a9)
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
commit 452725e80a01b1e140aea31eae10cee5e52a77a9
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Wed Mar 11 10:28:11 2020 +0000
Remove %{?_isa} from noarch package.
diff --git a/libnbd.spec b/libnbd.spec
index b145f4f..180bf51 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
commit f62121bd8a1ad27ba9d145f51bccb847bb30286b
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Wed Mar 11 10:18:06 2020 +0000
Fix bogus runtime Requires of new bash-completion package.
(cherry picked from commit 6f99e818808fcca50132686fba8f2b1bf916420b)
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(a)redhat.com> - 1.3.5-2
+- Fix bogus runtime Requires of new bash-completion package.
+
* Tue Mar 10 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.5-1
- New upstream development version 1.3.5.
- Add new bash-completion subpackage.
commit 6f99e818808fcca50132686fba8f2b1bf916420b
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Wed Mar 11 10:18:06 2020 +0000
Fix bogus runtime Requires of new bash-completion package.
diff --git a/libnbd.spec b/libnbd.spec
index fbc7c32..b145f4f 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(a)redhat.com> - 1.3.5-2
+- Fix bogus runtime Requires of new bash-completion package.
+
* Tue Mar 10 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.5-1
- New upstream development version 1.3.5.
- Add new bash-completion subpackage.
commit d9c8a67de77a36b8a8140c99afcb1c9ca46d1e65
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Tue Mar 10 21:57:39 2020 +0000
New upstream development version 1.3.5.
Add new bash-completion subpackage.
(cherry picked from commit 84455b03d57a6e84a5f26ce8442b1884b38ce513)
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(a)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(a)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
commit 84455b03d57a6e84a5f26ce8442b1884b38ce513
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Tue Mar 10 21:57:39 2020 +0000
New upstream development version 1.3.5.
Add new bash-completion subpackage.
diff --git a/libnbd.spec b/libnbd.spec
index bfdbc2d..fbc7c32 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(a)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(a)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
commit c9a1c8c30de9c0859939e0aee1b408a3f5ca1b93
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Sat Feb 29 15:26:38 2020 +0000
New upstream development version 1.3.4.
(cherry picked from commit e71e650b32f9cf4df28e24bab44527dc89b6842f)
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(a)redhat.com> - 1.3.4-1
+- New upstream development version 1.3.4.
+
* Thu Feb 27 2020 Richard W.M. Jones <rjones(a)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
commit e71e650b32f9cf4df28e24bab44527dc89b6842f
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Sat Feb 29 15:26:38 2020 +0000
New upstream development version 1.3.4.
diff --git a/libnbd.spec b/libnbd.spec
index 4c69e6a..bfdbc2d 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}
+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(a)redhat.com> - 1.3.4-1
+- New upstream development version 1.3.4.
+
* Wed Feb 26 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.3-2
- OCaml 4.10.0 final.
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
commit 536e109445642c0e55fa6ea5dae372d749ff44b8
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Thu Feb 27 16:52:42 2020 +0000
Bump release and rebuild.
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(a)redhat.com> - 1.3.3-2.2
+- Bump release and rebuild.
+
* Thu Feb 27 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.3-2.1
- OCaml 4.10.0 final (Fedora 32).
commit e60619c01d6b16a092400541ff94331d839c6761
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Thu Feb 27 15:02:42 2020 +0000
OCaml 4.10.0 final (Fedora 32).
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(a)redhat.com> - 1.3.3-2.1
+- OCaml 4.10.0 final (Fedora 32).
+
* Wed Feb 26 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.3-2
- OCaml 4.10.0 final.
commit 24eee05c869f66eaa840477139548ac3bbdf370d
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Wed Feb 26 10:56:26 2020 +0000
OCaml 4.10.0 final.
diff --git a/libnbd.spec b/libnbd.spec
index 8ee503c..4c69e6a 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -9,7 +9,7 @@
Name: libnbd
Version: 1.3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NBD client library in userspace
License: LGPLv2+
@@ -248,6 +248,9 @@ make %{?_smp_mflags} check || {
%changelog
+* Wed Feb 26 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.3-2
+- OCaml 4.10.0 final.
+
* Wed Feb 05 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.3-1
- New upstream development version 1.3.3.
commit 0be9b10393cf4e65fb9767058cfc5eb6acfa3820
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Wed Feb 5 13:58:01 2020 +0000
New upstream development version 1.3.3.
diff --git a/libnbd.spec b/libnbd.spec
index 1fcd1a3..8ee503c 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -8,7 +8,7 @@
%global source_directory 1.3-development
Name: libnbd
-Version: 1.3.2
+Version: 1.3.3
Release: 1%{?dist}
Summary: NBD client library in userspace
@@ -248,6 +248,9 @@ make %{?_smp_mflags} check || {
%changelog
+* Wed Feb 05 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.3-1
+- New upstream development version 1.3.3.
+
* Thu Jan 30 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.2-1
- New upstream development version 1.3.2.
diff --git a/sources b/sources
index b4cc997..5a385ff 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libnbd-1.3.2.tar.gz) =
27b0de34eb5814157409fca5bb89dabeb7ae3ddda7e60989f8fae6f362288315324c1c4b0f482ed58ea34f2134daa29c95c9e62d96492d742ef34aaac1df223f
-SHA512 (libnbd-1.3.2.tar.gz.sig) =
477f00c09dd3f5e8a1977696f40d08e25db6a4c9c535824bc686350dabf2dfb8d65359232d69d536ee0dd1c6967215b688ecb097f73dc01737c9973cc5313df6
+SHA512 (libnbd-1.3.3.tar.gz) =
d6edf70fa754c604f3cd60bfbaf90a5dba1f7ce23eac87c538ed4dc06f126606c4e43d53d096139e30778a72cfe31f5fa5c867e395bc7ff698272e1d46a84e87
+SHA512 (libnbd-1.3.3.tar.gz.sig) =
41b30f77902bd98c2a6d6b0fcb07d5c8a0163423315d809979648a5f931d05886f0e6b8cf5125292c1460833f8388d3c60d1e1a653c6bdd55d0bf7daf8acec6c
commit 185e538f28bed725db5c2e34c17f45d29da0ea64
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Thu Jan 30 11:55:21 2020 +0000
New upstream development version 1.3.2.
diff --git a/libnbd.spec b/libnbd.spec
index 36618ad..1fcd1a3 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -8,8 +8,8 @@
%global source_directory 1.3-development
Name: libnbd
-Version: 1.3.1
-Release: 5%{?dist}
+Version: 1.3.2
+Release: 1%{?dist}
Summary: NBD client library in userspace
License: LGPLv2+
@@ -248,6 +248,9 @@ make %{?_smp_mflags} check || {
%changelog
+* Thu Jan 30 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.2-1
+- New upstream development version 1.3.2.
+
* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3.1-5
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
diff --git a/sources b/sources
index eb45086..b4cc997 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libnbd-1.3.1.tar.gz) =
928ab849fa90388c44491622dd100beaef1d86882f770639bdeebc0eef5e22ab4bfd875530df949651f82c5ba4ef4718130a3d6b47701b9b774d7742a4b9424b
-SHA512 (libnbd-1.3.1.tar.gz.sig) =
ea6eda71d1dcb15c34f8b4c1ede4394e7f5eabe8b305a47adc87ea2011738be77df8bbddea209bdb65c0ca2c5432843e6c2b865ad9a51b06dfbc48eabaaf053c
+SHA512 (libnbd-1.3.2.tar.gz) =
27b0de34eb5814157409fca5bb89dabeb7ae3ddda7e60989f8fae6f362288315324c1c4b0f482ed58ea34f2134daa29c95c9e62d96492d742ef34aaac1df223f
+SHA512 (libnbd-1.3.2.tar.gz.sig) =
477f00c09dd3f5e8a1977696f40d08e25db6a4c9c535824bc686350dabf2dfb8d65359232d69d536ee0dd1c6967215b688ecb097f73dc01737c9973cc5313df6
commit 8335789202c7dcb0938add99cd2be2c02bfde656
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jan 29 09:49:30 2020 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/libnbd.spec b/libnbd.spec
index 63d2df7..36618ad 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -9,7 +9,7 @@
Name: libnbd
Version: 1.3.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: NBD client library in userspace
License: LGPLv2+
@@ -248,6 +248,9 @@ make %{?_smp_mflags} check || {
%changelog
+* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3.1-5
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
* Sun Jan 19 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.1-4
- Bump release and rebuild.
commit 62c5a6b9f096932edd3a035e8e0c6f7f69a6709e
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Sun Jan 19 14:34:13 2020 +0000
Bump release and rebuild.
diff --git a/libnbd.spec b/libnbd.spec
index 16c65e3..63d2df7 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -9,7 +9,7 @@
Name: libnbd
Version: 1.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: NBD client library in userspace
License: LGPLv2+
@@ -248,6 +248,9 @@ make %{?_smp_mflags} check || {
%changelog
+* Sun Jan 19 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.1-4
+- Bump release and rebuild.
+
* Sun Jan 19 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.1-3
- OCaml 4.10.0+beta1 rebuild.
commit 3c2113e64a43545ecbad8b184c178d077b496292
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Sun Jan 19 11:51:06 2020 +0000
OCaml 4.10.0+beta1 rebuild.
diff --git a/libnbd.spec b/libnbd.spec
index a22f523..16c65e3 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -9,7 +9,7 @@
Name: libnbd
Version: 1.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NBD client library in userspace
License: LGPLv2+
@@ -248,6 +248,9 @@ make %{?_smp_mflags} check || {
%changelog
+* Sun Jan 19 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.1-3
+- OCaml 4.10.0+beta1 rebuild.
+
* Thu Dec 12 2019 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.1-2
- Rebuild for OCaml 4.09.0.
commit b0b2d070c440aa18e236449b7d8cf4dfe1ac201a
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Thu Dec 12 18:15:56 2019 +0000
Rebuild for OCaml 4.09.0.
diff --git a/libnbd.spec b/libnbd.spec
index ae60375..a22f523 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -9,7 +9,7 @@
Name: libnbd
Version: 1.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NBD client library in userspace
License: LGPLv2+
@@ -248,6 +248,9 @@ make %{?_smp_mflags} check || {
%changelog
+* Thu Dec 12 2019 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.1-2
+- Rebuild for OCaml 4.09.0.
+
* Tue Dec 03 2019 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.1-1
- New upstream development version 1.3.1.
commit c564a96e30bbbc195c61b5ecb7670ee5b5017602
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Tue Dec 3 13:21:03 2019 +0000
New upstream development version 1.3.1.
diff --git a/libnbd.spec b/libnbd.spec
index 24f3ea3..ae60375 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -5,11 +5,11 @@
%global patches_touch_autotools %{nil}
# The source directory.
-%global source_directory 1.2-stable
+%global source_directory 1.3-development
Name: libnbd
-Version: 1.2.0
-Release: 2%{?dist}
+Version: 1.3.1
+Release: 1%{?dist}
Summary: NBD client library in userspace
License: LGPLv2+
@@ -248,6 +248,9 @@ make %{?_smp_mflags} check || {
%changelog
+* Tue Dec 03 2019 Richard W.M. Jones <rjones(a)redhat.com> - 1.3.1-1
+- New upstream development version 1.3.1.
+
* Wed Nov 27 2019 Richard W.M. Jones <rjones(a)redhat.com> - 1.2.0-2
- Use gpgverify macro instead of explicit gpgv2 command.
diff --git a/sources b/sources
index cab104f..eb45086 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libnbd-1.2.0.tar.gz) =
a823bd0d4b79eeeb28e64fc6a4132da8af1fd807ad04d48fddab8ee6af944d7e96cc2e4947ab959d7ccceb6aeda0f2ebe31adfbf51f1b8e757d8034734e96543
-SHA512 (libnbd-1.2.0.tar.gz.sig) =
285a2154c91b5316b5776121580291ba7ecea48f3c168929706bc353c8fdb1f9a08b71e1f3464ebd6c9c3265e29525e2f022b353999ca58fa41e9a6e6d6efdcd
+SHA512 (libnbd-1.3.1.tar.gz) =
928ab849fa90388c44491622dd100beaef1d86882f770639bdeebc0eef5e22ab4bfd875530df949651f82c5ba4ef4718130a3d6b47701b9b774d7742a4b9424b
+SHA512 (libnbd-1.3.1.tar.gz.sig) =
ea6eda71d1dcb15c34f8b4c1ede4394e7f5eabe8b305a47adc87ea2011738be77df8bbddea209bdb65c0ca2c5432843e6c2b865ad9a51b06dfbc48eabaaf053c
commit 16a44127c664e82fa698fe9d8126e20a93dc4de3
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Wed Nov 27 11:05:44 2019 +0000
Use gpgverify macro instead of explicit gpgv2 command.
diff --git a/libnbd.spec b/libnbd.spec
index cb77068..24f3ea3 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -9,7 +9,7 @@
Name: libnbd
Version: 1.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NBD client library in userspace
License: LGPLv2+
@@ -140,8 +140,7 @@ This package contains FUSE support for %{name}.
%prep
%if 0%{verify_tarball_signature}
-tmphome="$(mktemp -d)"
-gpgv2 --homedir "$tmphome" --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}'
--data='%{SOURCE0}'
%endif
%autosetup -p1
%if 0%{patches_touch_autotools}
@@ -249,6 +248,9 @@ make %{?_smp_mflags} check || {
%changelog
+* Wed Nov 27 2019 Richard W.M. Jones <rjones(a)redhat.com> - 1.2.0-2
+- Use gpgverify macro instead of explicit gpgv2 command.
+
* Thu Nov 14 2019 Richard W.M. Jones <rjones(a)redhat.com> - 1.2.0-1
- New stable release 1.2.0