From 8e4e221f2f97f95d0f590315ef35a868755a0482 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 23 Oct 2023 16:49:49 +0100 Subject: [PATCH 1/7] New upstream stable version 1.36.1 --- nbdkit.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 2e4f8a6..bf4c8b8 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -59,7 +59,7 @@ ExclusiveArch: x86_64 %global source_directory 1.36-stable Name: nbdkit -Version: 1.36.0 +Version: 1.36.1 Release: 1%{?dist} Summary: NBD server @@ -1250,8 +1250,11 @@ export LIBGUESTFS_TRACE=1 %changelog +* Mon Oct 23 2023 Richard W.M. Jones - 1.36.1-1 +- New upstream stable version 1.36.1 + * Wed Sep 27 2023 Richard W.M. Jones - 1.36.0-1 -- New upstream development version 1.36.0 +- New upstream stable version 1.36.0 * Mon Sep 11 2023 Richard W.M. Jones - 1.35.13-1 - New upstream development version 1.35.13 diff --git a/sources b/sources index 38585e9..6fc2555 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.36.0.tar.gz) = 4c753e09853c1fa41311f3f7c86e4b9af9be69a984854142612a0bc9ad915e2811d4be4e29f263a6887277ece4204dd931807fe65e4fda8b4b9eab6dc3645c7b -SHA512 (nbdkit-1.36.0.tar.gz.sig) = 0c1f2f7799e83c23ee2a52d362e5ae02cfb3ce5bd0cc0eacd06324990d9a4a95d14b8b4d182821b3e0185bd3464ff88684894bc79472b349404b54d901446088 +SHA512 (nbdkit-1.36.1.tar.gz) = ca0e6e6729fb6f43a9717a3815dfb8ff54a2f182ef079e72b0e5e1b018c55f2205be52a10abc0b0a2243d0737f27b1ccf67c0d9586135454a460d39dad79f042 +SHA512 (nbdkit-1.36.1.tar.gz.sig) = d0cf5e58f1d4e5fb601d33f6d1cba7fdc4f7085b3481775e061e89107e1d86cb524b1cae35e79a09873558945844993acd08294a74dbf0c289666caa39f0e243 From 533926231d1c33f4b8f99867b56d1acc5b7d002c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 26 Nov 2023 10:35:03 +0000 Subject: [PATCH 2/7] New upstream stable version 1.36.2 --- nbdkit.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index bf4c8b8..aa6551d 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -59,7 +59,7 @@ ExclusiveArch: x86_64 %global source_directory 1.36-stable Name: nbdkit -Version: 1.36.1 +Version: 1.36.2 Release: 1%{?dist} Summary: NBD server @@ -1250,6 +1250,9 @@ export LIBGUESTFS_TRACE=1 %changelog +* Sun Nov 26 2023 Richard W.M. Jones - 1.36.2-1 +- New upstream stable version 1.36.2 + * Mon Oct 23 2023 Richard W.M. Jones - 1.36.1-1 - New upstream stable version 1.36.1 diff --git a/sources b/sources index 6fc2555..8e6df75 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.36.1.tar.gz) = ca0e6e6729fb6f43a9717a3815dfb8ff54a2f182ef079e72b0e5e1b018c55f2205be52a10abc0b0a2243d0737f27b1ccf67c0d9586135454a460d39dad79f042 -SHA512 (nbdkit-1.36.1.tar.gz.sig) = d0cf5e58f1d4e5fb601d33f6d1cba7fdc4f7085b3481775e061e89107e1d86cb524b1cae35e79a09873558945844993acd08294a74dbf0c289666caa39f0e243 +SHA512 (nbdkit-1.37.3.tar.gz) = 6f3a78e24a93776623a3209cf4c2e4824c8ab78c761186d13964be7af06ffaab34a550d89be5ea297b1d25c81b3646e8ff2d42389d1b1a0281577fa5bf319445 +SHA512 (nbdkit-1.37.3.tar.gz.sig) = b1c833b46c0eb488dfc831f1b554c094dd63f1f8aad97eaa054c61579ed5262a674370e46ca21b4d3843d8f24c6d713c956842d7217bb7949097f58168a205c2 From d8bbfaccd846cf00e75290547dc6a08ee24caa7d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 26 Nov 2023 12:16:49 +0000 Subject: [PATCH 3/7] Use the correct sources for ths branch --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 8e6df75..50adcc8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.37.3.tar.gz) = 6f3a78e24a93776623a3209cf4c2e4824c8ab78c761186d13964be7af06ffaab34a550d89be5ea297b1d25c81b3646e8ff2d42389d1b1a0281577fa5bf319445 -SHA512 (nbdkit-1.37.3.tar.gz.sig) = b1c833b46c0eb488dfc831f1b554c094dd63f1f8aad97eaa054c61579ed5262a674370e46ca21b4d3843d8f24c6d713c956842d7217bb7949097f58168a205c2 +SHA512 (nbdkit-1.36.2.tar.gz) = a776808c6e7ab488b109e993fed5a6174e6fc35f894dace74b18cef9f8e0f640fb90bd4fd74183fc025da1f607c8907ee438369146bfbb2a48f6753748b9cf04 +SHA512 (nbdkit-1.36.2.tar.gz.sig) = 04ef71b3fae7bf126333a8f02f6498db0b615057c942071502606b45ae5da1eafb15378a444a5388e3a3da67768687d4c151c259f9bd23ba583554cd54c054db From c2db7b231a83d68f570c87e5716485ef901d58a1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 16 Jan 2024 12:55:19 +0000 Subject: [PATCH 4/7] New upstream stable version 1.36.3 --- nbdkit.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index aa6551d..202b33c 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -59,7 +59,7 @@ ExclusiveArch: x86_64 %global source_directory 1.36-stable Name: nbdkit -Version: 1.36.2 +Version: 1.36.3 Release: 1%{?dist} Summary: NBD server @@ -1250,6 +1250,9 @@ export LIBGUESTFS_TRACE=1 %changelog +* Tue Jan 16 2024 Richard W.M. Jones - 1.36.3-1 +- New upstream stable version 1.36.3 + * Sun Nov 26 2023 Richard W.M. Jones - 1.36.2-1 - New upstream stable version 1.36.2 diff --git a/sources b/sources index 50adcc8..dcd6a6a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.36.2.tar.gz) = a776808c6e7ab488b109e993fed5a6174e6fc35f894dace74b18cef9f8e0f640fb90bd4fd74183fc025da1f607c8907ee438369146bfbb2a48f6753748b9cf04 -SHA512 (nbdkit-1.36.2.tar.gz.sig) = 04ef71b3fae7bf126333a8f02f6498db0b615057c942071502606b45ae5da1eafb15378a444a5388e3a3da67768687d4c151c259f9bd23ba583554cd54c054db +SHA512 (nbdkit-1.36.3.tar.gz) = 28b43f5c7ecb5d804eb97eab3e7b5e8354472d572909c1832531bd9fd5fcb3dd55f2dc9478e77861c71dda4f2d36249a8d97b9c676829c585afeb64956baf4ef +SHA512 (nbdkit-1.36.3.tar.gz.sig) = 5d28a273b2d6d5c283b2af53689e1737a052b227ad09c862e8407ddb4b6880b4a5220b1dcaa0453f92af52cab897ce996504d5690d5f477fa26f0724d9a38c2a From e0f1c5b33a9f55922831c7050fa897ac553d2140 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 4 Mar 2024 18:32:05 +0000 Subject: [PATCH 5/7] New upstream stable version 1.36.4 --- nbdkit.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 202b33c..6e46e46 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -59,7 +59,7 @@ ExclusiveArch: x86_64 %global source_directory 1.36-stable Name: nbdkit -Version: 1.36.3 +Version: 1.36.4 Release: 1%{?dist} Summary: NBD server @@ -1250,6 +1250,9 @@ export LIBGUESTFS_TRACE=1 %changelog +* Mon Mar 04 2024 Richard W.M. Jones - 1.36.4-1 +- New upstream stable version 1.36.4 + * Tue Jan 16 2024 Richard W.M. Jones - 1.36.3-1 - New upstream stable version 1.36.3 diff --git a/sources b/sources index dcd6a6a..ff71772 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.36.3.tar.gz) = 28b43f5c7ecb5d804eb97eab3e7b5e8354472d572909c1832531bd9fd5fcb3dd55f2dc9478e77861c71dda4f2d36249a8d97b9c676829c585afeb64956baf4ef -SHA512 (nbdkit-1.36.3.tar.gz.sig) = 5d28a273b2d6d5c283b2af53689e1737a052b227ad09c862e8407ddb4b6880b4a5220b1dcaa0453f92af52cab897ce996504d5690d5f477fa26f0724d9a38c2a +SHA512 (nbdkit-1.36.4.tar.gz) = 01116ed685e640f7f4cf9d327158c7ce7d446cad6efc7efb96552e80b51ce2b4f84f4bd13f7ad0f0b89db33402b30dcdf8731986209d9bfd39c3f2d78d6dadd3 +SHA512 (nbdkit-1.36.4.tar.gz.sig) = d1f035b7c5e6257792e3bf3ba57a232ede2ac8d591e2d35127779bbc7c651fd0953a8059d90eec548f0fbf4ebf2f78fe6eb6ae8e2df25d1cd60ad2a5ebc0ecbd From ec0f4e84f8c7000a12ae80b5c3cef2fdf40fadec Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 4 Apr 2024 21:23:56 +0100 Subject: [PATCH 6/7] Rebuild autoconf cruft unconditionally (cherry picked from libnbd commit 11a78d929de957995cf127e70c2762326132a263) (cherry picked from commit 8de2617c9f8b2fad9d47840f5fc017c01a9c0666) --- nbdkit.spec | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 6e46e46..481d93d 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -52,9 +52,6 @@ ExclusiveArch: x86_64 # If we should verify tarball signature with GPGv2. %global verify_tarball_signature 1 -# If there are patches which touch autotools files, set this to 1. -%global patches_touch_autotools %{nil} - # The source directory. %global source_directory 1.36-stable @@ -87,9 +84,9 @@ Source4: nbdkit.attr Source5: nbdkit-find-provides BuildRequires: make -%if 0%{patches_touch_autotools} + +# For rebuilding autoconf cruft: BuildRequires: autoconf, automake, libtool -%endif BuildRequires: gcc, gcc-c++ BuildRequires: %{_bindir}/pod2man @@ -669,9 +666,7 @@ for %{name}. %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %endif %autosetup -p1 -%if 0%{patches_touch_autotools} autoreconf -i -%endif %build From 7c09858975a47ebc0a6b4d2f8642bb44c981c6b7 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 4 Apr 2024 21:40:26 +0100 Subject: [PATCH 7/7] New upstream stable version 1.36.5 --- nbdkit.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 481d93d..d08a39f 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -56,7 +56,7 @@ ExclusiveArch: x86_64 %global source_directory 1.36-stable Name: nbdkit -Version: 1.36.4 +Version: 1.36.5 Release: 1%{?dist} Summary: NBD server @@ -1245,6 +1245,9 @@ export LIBGUESTFS_TRACE=1 %changelog +* Thu Apr 04 2024 Richard W.M. Jones - 1.36.5-1 +- New upstream stable version 1.36.5 + * Mon Mar 04 2024 Richard W.M. Jones - 1.36.4-1 - New upstream stable version 1.36.4 diff --git a/sources b/sources index ff71772..5fd3ebe 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.36.4.tar.gz) = 01116ed685e640f7f4cf9d327158c7ce7d446cad6efc7efb96552e80b51ce2b4f84f4bd13f7ad0f0b89db33402b30dcdf8731986209d9bfd39c3f2d78d6dadd3 -SHA512 (nbdkit-1.36.4.tar.gz.sig) = d1f035b7c5e6257792e3bf3ba57a232ede2ac8d591e2d35127779bbc7c651fd0953a8059d90eec548f0fbf4ebf2f78fe6eb6ae8e2df25d1cd60ad2a5ebc0ecbd +SHA512 (nbdkit-1.36.5.tar.gz) = c1be949bf3721f90494dce20340b7615f27b83a2a57128ae3cdf79c572622f57ce0f4d8cc81e544be010862ef51ccfb3c52ae315e23bd90d939943ca0520c423 +SHA512 (nbdkit-1.36.5.tar.gz.sig) = 37315f0f4e200e4684d942b67534a559de4f6efe30bced4756281e7753ae342e5c996b35137718e57cadc84fde857160f92e6451b5b7dea66fc251092ff2955e