From 3d4d330d2279a8ed1dce6fb51faf9a78eb4fee00 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 15 Mar 2022 17:02:48 +0000 Subject: [PATCH 01/13] New stable version 1.30.1 Bootstrap nbdkit-srpm-macros --- nbdkit.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index ff4e210..1c88895 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -52,8 +52,8 @@ ExclusiveArch: x86_64 %global source_directory 1.30-stable Name: nbdkit -Version: 1.30.0 -Release: 3%{?dist} +Version: 1.30.1 +Release: 1%{?dist} Summary: NBD server License: BSD @@ -152,7 +152,7 @@ BuildRequires: %{_bindir}/ssh-keygen # This package has RPM rules that create the automatic Provides: for # nbdkit plugins and filters. This means nbdkit build depends on # itself, but it's a simple noarch package so easy to install. -BuildRequires: nbdkit-srpm-macros >= 1.30.0 +## XXX TEMP DISABLE XXX BuildRequires: nbdkit-srpm-macros >= 1.30.0 # nbdkit is a metapackage pulling the server and a useful subset # of the plugins and filters. @@ -1172,6 +1172,9 @@ export LIBGUESTFS_TRACE=1 %changelog +* Tue Mar 15 2022 Richard W.M. Jones - 1.30.1-1 +- New stable version 1.30.1 + * Mon Feb 28 2022 Richard W.M. Jones - 1.30.0-3 - Add nbdkit-srpm-macros diff --git a/sources b/sources index 61f30e8..9fccb5b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.30.0.tar.gz) = bdd9065c4faca312e103946a84901316443d8186e5b23658b721cd58e8d5e284ab6ef74996165edbf22c19bc1561068ac8c2eb368e21eaa227c43950d692e423 -SHA512 (nbdkit-1.30.0.tar.gz.sig) = bf4caf8eca8997f5033665f208454383967bc3f4f1c51925574698f3828efdf0b9004ac243bccd74a751b4edf48a53e956b1befe4e8bf29aa5a78647d5874e52 +SHA512 (nbdkit-1.30.1.tar.gz) = 433016b43e192fb07697af0b357aa817b46af811494762a8d38a5d7d8edfeb155451b7e1a35062dda10cc2bf9b19865a3faa5b781bd8cf1a121e7088582b586d +SHA512 (nbdkit-1.30.1.tar.gz.sig) = 7148c52779f345bfa515f1dfb38ed8e6efdc8b89e8d7a51b966c3b6fb5ffe48f74d114038ef3215d5ca7c3a206c11cc3946ebc90971647a52e71fdfaed902ee8 From 982591104efa7c3d671036825a262dfea3413d9b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 15 Mar 2022 17:45:44 +0000 Subject: [PATCH 02/13] Complete bootstrap of nbdkit-srpm-macros for F36 --- nbdkit.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 1c88895..ae5e9a2 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -53,7 +53,7 @@ ExclusiveArch: x86_64 Name: nbdkit Version: 1.30.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD server License: BSD @@ -152,7 +152,7 @@ BuildRequires: %{_bindir}/ssh-keygen # This package has RPM rules that create the automatic Provides: for # nbdkit plugins and filters. This means nbdkit build depends on # itself, but it's a simple noarch package so easy to install. -## XXX TEMP DISABLE XXX BuildRequires: nbdkit-srpm-macros >= 1.30.0 +BuildRequires: nbdkit-srpm-macros >= 1.30.0 # nbdkit is a metapackage pulling the server and a useful subset # of the plugins and filters. @@ -1172,7 +1172,7 @@ export LIBGUESTFS_TRACE=1 %changelog -* Tue Mar 15 2022 Richard W.M. Jones - 1.30.1-1 +* Tue Mar 15 2022 Richard W.M. Jones - 1.30.1-2 - New stable version 1.30.1 * Mon Feb 28 2022 Richard W.M. Jones - 1.30.0-3 From 1a89ea645dd5fda8769586d7952bdbd78300d24d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 2 Apr 2022 16:18:25 +0100 Subject: [PATCH 03/13] New stable version 1.30.2 --- nbdkit.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index ae5e9a2..0d419b1 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -52,8 +52,8 @@ ExclusiveArch: x86_64 %global source_directory 1.30-stable Name: nbdkit -Version: 1.30.1 -Release: 2%{?dist} +Version: 1.30.2 +Release: 1%{?dist} Summary: NBD server License: BSD @@ -1172,6 +1172,9 @@ export LIBGUESTFS_TRACE=1 %changelog +* Sat Apr 02 2022 Richard W.M. Jones - 1.30.2-1 +- New stable version 1.30.2 + * Tue Mar 15 2022 Richard W.M. Jones - 1.30.1-2 - New stable version 1.30.1 diff --git a/sources b/sources index 9fccb5b..4009f4c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.30.1.tar.gz) = 433016b43e192fb07697af0b357aa817b46af811494762a8d38a5d7d8edfeb155451b7e1a35062dda10cc2bf9b19865a3faa5b781bd8cf1a121e7088582b586d -SHA512 (nbdkit-1.30.1.tar.gz.sig) = 7148c52779f345bfa515f1dfb38ed8e6efdc8b89e8d7a51b966c3b6fb5ffe48f74d114038ef3215d5ca7c3a206c11cc3946ebc90971647a52e71fdfaed902ee8 +SHA512 (nbdkit-1.30.2.tar.gz) = 84da92005bbb59a860c9ba5a88082d859c9dd4f9db5c81d8760e9d6925e10d80d27de78be9391113bf715d16de7726594b5b803512cd8b59ce14ec135fc4b09d +SHA512 (nbdkit-1.30.2.tar.gz.sig) = c64ccdbc25f56626360aa812af330e33f26e6954415b93976f5a3d58808affdc94efa6e309066b23dbfd354192c4693a408b79aa583a6f5e84ab1c2ef406179e From ddeebbf7874065be5e67ff875e6304b7d7dbdee8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 16 Apr 2022 13:05:44 +0100 Subject: [PATCH 04/13] New stable version 1.30.3 - Remove dependency on ssh-keygen which was never really used. (cherry picked from commit 55a4710f4f68f7c767f70313ca475f014cf7fa10) --- nbdkit.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 0d419b1..5548fac 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -52,7 +52,7 @@ ExclusiveArch: x86_64 %global source_directory 1.30-stable Name: nbdkit -Version: 1.30.2 +Version: 1.30.3 Release: 1%{?dist} Summary: NBD server @@ -147,7 +147,6 @@ BuildRequires: %{_bindir}/socat %endif BuildRequires: %{_sbindir}/ss BuildRequires: %{_bindir}/stat -BuildRequires: %{_bindir}/ssh-keygen # This package has RPM rules that create the automatic Provides: for # nbdkit plugins and filters. This means nbdkit build depends on @@ -1172,6 +1171,10 @@ export LIBGUESTFS_TRACE=1 %changelog +* Sat Apr 16 2022 Richard W.M. Jones - 1.30.3-1 +- New stable version 1.30.3 +- Remove dependency on ssh-keygen which was never really used. + * Sat Apr 02 2022 Richard W.M. Jones - 1.30.2-1 - New stable version 1.30.2 diff --git a/sources b/sources index 4009f4c..8fb7c98 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.30.2.tar.gz) = 84da92005bbb59a860c9ba5a88082d859c9dd4f9db5c81d8760e9d6925e10d80d27de78be9391113bf715d16de7726594b5b803512cd8b59ce14ec135fc4b09d -SHA512 (nbdkit-1.30.2.tar.gz.sig) = c64ccdbc25f56626360aa812af330e33f26e6954415b93976f5a3d58808affdc94efa6e309066b23dbfd354192c4693a408b79aa583a6f5e84ab1c2ef406179e +SHA512 (nbdkit-1.30.3.tar.gz) = 536dcae12370896c90ba662ef00296c30e749bbc20470b75c9632274b2d338637f2be175075040e0250bb755e09dfcc4d30cbc03b154e7f625bb8f1d566858ef +SHA512 (nbdkit-1.30.3.tar.gz.sig) = 42472296cd5ddabaa0a6ba963e591160ee91c7988e060a0136f25b5230c16e1f205220fc5128a8ed77bc883a48250905886c2bb13b485ed2791eb3d91252b46e From 82297a83ec94e201e28e355563ed8d8cd6a68958 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 26 Apr 2022 09:11:42 +0100 Subject: [PATCH 05/13] New stable version 1.30.4 --- nbdkit.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 5548fac..49a5085 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -52,7 +52,7 @@ ExclusiveArch: x86_64 %global source_directory 1.30-stable Name: nbdkit -Version: 1.30.3 +Version: 1.30.4 Release: 1%{?dist} Summary: NBD server @@ -1171,6 +1171,9 @@ export LIBGUESTFS_TRACE=1 %changelog +* Tue Apr 26 2022 Richard W.M. Jones - 1.30.4-1 +- New stable version 1.30.4 + * Sat Apr 16 2022 Richard W.M. Jones - 1.30.3-1 - New stable version 1.30.3 - Remove dependency on ssh-keygen which was never really used. diff --git a/sources b/sources index 8fb7c98..b012ddd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.30.3.tar.gz) = 536dcae12370896c90ba662ef00296c30e749bbc20470b75c9632274b2d338637f2be175075040e0250bb755e09dfcc4d30cbc03b154e7f625bb8f1d566858ef -SHA512 (nbdkit-1.30.3.tar.gz.sig) = 42472296cd5ddabaa0a6ba963e591160ee91c7988e060a0136f25b5230c16e1f205220fc5128a8ed77bc883a48250905886c2bb13b485ed2791eb3d91252b46e +SHA512 (nbdkit-1.30.4.tar.gz) = b2db6cde29b04fc73831a5f062b7b5d0a4ed2c3785ccefe81add4bc89cd62d5705b904922f53ea1fd4b0987c9aa2a0ef34fc58eefa804b37d424a44112fbf1b1 +SHA512 (nbdkit-1.30.4.tar.gz.sig) = ed8a60214274d88f418656b1b50d9eb5b73aa0ff18e36446cf21a6fe2c07ca72311fd745c5d99f94cb3676dba2ee3a768ab08a05cf9d0d24d8156c43118d57d6 From 2b7d58921de562976599bbe29e14186a7f2ca70c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 12 May 2022 15:38:41 +0100 Subject: [PATCH 06/13] New stable version 1.30.5 --- nbdkit.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 49a5085..0b48c61 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -52,7 +52,7 @@ ExclusiveArch: x86_64 %global source_directory 1.30-stable Name: nbdkit -Version: 1.30.4 +Version: 1.30.5 Release: 1%{?dist} Summary: NBD server @@ -1171,6 +1171,9 @@ export LIBGUESTFS_TRACE=1 %changelog +* Thu May 12 2022 Richard W.M. Jones - 1.30.5-1 +- New stable version 1.30.5 + * Tue Apr 26 2022 Richard W.M. Jones - 1.30.4-1 - New stable version 1.30.4 diff --git a/sources b/sources index b012ddd..ceac80d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.30.4.tar.gz) = b2db6cde29b04fc73831a5f062b7b5d0a4ed2c3785ccefe81add4bc89cd62d5705b904922f53ea1fd4b0987c9aa2a0ef34fc58eefa804b37d424a44112fbf1b1 -SHA512 (nbdkit-1.30.4.tar.gz.sig) = ed8a60214274d88f418656b1b50d9eb5b73aa0ff18e36446cf21a6fe2c07ca72311fd745c5d99f94cb3676dba2ee3a768ab08a05cf9d0d24d8156c43118d57d6 +SHA512 (nbdkit-1.30.5.tar.gz) = 033f06a23f7f227acb8516994582c94033a35d11ff8d7db8ca310b73cf591ea1a4833dbfbaf58e653556a1bcf30cbca21494b7f9e61a1a8cafd566993b24a799 +SHA512 (nbdkit-1.30.5.tar.gz.sig) = c8e342ff168b3308b888658f2958a2ccfd2e2b37664f65d3a71feb495085bd60834b4142103c6cf51e83b5d08f2815ab392b5afe5077b9a8fbfee9218db9bdf1 From f748042dce7567ce700241520132b319dbbdad4a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 13 Jun 2022 13:08:54 +0100 Subject: [PATCH 07/13] New stable version 1.30.6 --- nbdkit.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 0b48c61..ac66c3e 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -52,7 +52,7 @@ ExclusiveArch: x86_64 %global source_directory 1.30-stable Name: nbdkit -Version: 1.30.5 +Version: 1.30.6 Release: 1%{?dist} Summary: NBD server @@ -1171,6 +1171,9 @@ export LIBGUESTFS_TRACE=1 %changelog +* Mon Jun 13 2022 Richard W.M. Jones - 1.30.6-1 +- New stable version 1.30.6 + * Thu May 12 2022 Richard W.M. Jones - 1.30.5-1 - New stable version 1.30.5 diff --git a/sources b/sources index ceac80d..0f3ee8e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.30.5.tar.gz) = 033f06a23f7f227acb8516994582c94033a35d11ff8d7db8ca310b73cf591ea1a4833dbfbaf58e653556a1bcf30cbca21494b7f9e61a1a8cafd566993b24a799 -SHA512 (nbdkit-1.30.5.tar.gz.sig) = c8e342ff168b3308b888658f2958a2ccfd2e2b37664f65d3a71feb495085bd60834b4142103c6cf51e83b5d08f2815ab392b5afe5077b9a8fbfee9218db9bdf1 +SHA512 (nbdkit-1.30.6.tar.gz) = c12b4931411894d59bed32551d1a89326f88e19569ce278531df5de9a2fb32118a6092af83596d99f5a50f792e3cfa676809abb533e75263a3100a0772c008c4 +SHA512 (nbdkit-1.30.6.tar.gz.sig) = 21a7e3f2747f5b9ef7f7c1acfaa21024e1d6dcdc2f541ec8c4146ccffb9c7d8d3b6fb57fe8c9968d5db8454b616dd8e221a2a766baef4528629f0b9f3dd5b835 From d17e36b0c79c4c88be30129d1d5b2e9ea2e9c127 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 10 Jul 2022 13:04:52 +0100 Subject: [PATCH 08/13] New stable version 1.30.7 --- nbdkit.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index ac66c3e..e95385c 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -52,7 +52,7 @@ ExclusiveArch: x86_64 %global source_directory 1.30-stable Name: nbdkit -Version: 1.30.6 +Version: 1.30.7 Release: 1%{?dist} Summary: NBD server @@ -1171,6 +1171,9 @@ export LIBGUESTFS_TRACE=1 %changelog +* Sun Jul 10 2022 Richard W.M. Jones - 1.30.7-1 +- New stable version 1.30.7 + * Mon Jun 13 2022 Richard W.M. Jones - 1.30.6-1 - New stable version 1.30.6 diff --git a/sources b/sources index 0f3ee8e..3d124fd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.30.6.tar.gz) = c12b4931411894d59bed32551d1a89326f88e19569ce278531df5de9a2fb32118a6092af83596d99f5a50f792e3cfa676809abb533e75263a3100a0772c008c4 -SHA512 (nbdkit-1.30.6.tar.gz.sig) = 21a7e3f2747f5b9ef7f7c1acfaa21024e1d6dcdc2f541ec8c4146ccffb9c7d8d3b6fb57fe8c9968d5db8454b616dd8e221a2a766baef4528629f0b9f3dd5b835 +SHA512 (nbdkit-1.30.7.tar.gz) = acf48dc8f2b2d8967aca106f9c267cd8f022c54dbe07d1f32c8b5d14df33215f71029622f095fef1a442a2ab495618e81844b0b5f4a24b2be2869b3b3c990bf1 +SHA512 (nbdkit-1.30.7.tar.gz.sig) = 46f5c265240b447af7703ec8bce473e5951452c163c8f302291e3495c4c6ca5790b9382063c68613390bccf998d8c18efddda4878870af72029b854bb69e308e From 71921bfecc01bae3121195308794b6bdd8c2e3b0 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 19 Jul 2022 11:23:46 +0100 Subject: [PATCH 09/13] New stable version 1.30.8 --- nbdkit.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index e95385c..ed24069 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -52,7 +52,7 @@ ExclusiveArch: x86_64 %global source_directory 1.30-stable Name: nbdkit -Version: 1.30.7 +Version: 1.30.8 Release: 1%{?dist} Summary: NBD server @@ -1171,6 +1171,9 @@ export LIBGUESTFS_TRACE=1 %changelog +* Tue Jul 19 2022 Richard W.M. Jones - 1.30.8-1 +- New stable version 1.30.8 + * Sun Jul 10 2022 Richard W.M. Jones - 1.30.7-1 - New stable version 1.30.7 diff --git a/sources b/sources index 3d124fd..43a1ba6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.30.7.tar.gz) = acf48dc8f2b2d8967aca106f9c267cd8f022c54dbe07d1f32c8b5d14df33215f71029622f095fef1a442a2ab495618e81844b0b5f4a24b2be2869b3b3c990bf1 -SHA512 (nbdkit-1.30.7.tar.gz.sig) = 46f5c265240b447af7703ec8bce473e5951452c163c8f302291e3495c4c6ca5790b9382063c68613390bccf998d8c18efddda4878870af72029b854bb69e308e +SHA512 (nbdkit-1.30.8.tar.gz) = 984e2ef921b0f339d2950cc87b9e5cfd3a6c45c107116a2ff8b5d30aa08bb9c9edbb8e16aa0a57c93b160ad411df842f1fa72f90f80fc261a0c30ec6a7d99795 +SHA512 (nbdkit-1.30.8.tar.gz.sig) = 2794da218bd052d9bed818343ae186945304a467ebd7ae75373faf471ff4fd18ed161dc1f866f17e4f190b5acc18141ff92e914ddb497a5e07065ebac3461f3b From 07f7812d64e68e450bfe61124115c564372922cb Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 1 Aug 2022 17:20:27 +0100 Subject: [PATCH 10/13] New stable version 1.30.9 --- nbdkit.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index ed24069..4105406 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -52,7 +52,7 @@ ExclusiveArch: x86_64 %global source_directory 1.30-stable Name: nbdkit -Version: 1.30.8 +Version: 1.30.9 Release: 1%{?dist} Summary: NBD server @@ -1171,6 +1171,9 @@ export LIBGUESTFS_TRACE=1 %changelog +* Tue Jul 19 2022 Richard W.M. Jones - 1.30.9-1 +- New stable version 1.30.9 + * Tue Jul 19 2022 Richard W.M. Jones - 1.30.8-1 - New stable version 1.30.8 diff --git a/sources b/sources index 43a1ba6..4a6dba8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.30.8.tar.gz) = 984e2ef921b0f339d2950cc87b9e5cfd3a6c45c107116a2ff8b5d30aa08bb9c9edbb8e16aa0a57c93b160ad411df842f1fa72f90f80fc261a0c30ec6a7d99795 -SHA512 (nbdkit-1.30.8.tar.gz.sig) = 2794da218bd052d9bed818343ae186945304a467ebd7ae75373faf471ff4fd18ed161dc1f866f17e4f190b5acc18141ff92e914ddb497a5e07065ebac3461f3b +SHA512 (nbdkit-1.30.9.tar.gz) = aa5b443fde25763c225aea8fbfea82a82ccf3e65d45596989b1b5cc2912a4c7d3e4683d486b2d18ff85084a85de2f6b80355647d1a9f9138c4cb551b67a2a023 +SHA512 (nbdkit-1.30.9.tar.gz.sig) = c39a23bdb190eb7b0caf19da46c66dc75a5fe11aa56af9d6acb0215b0562d96154341c250d6f80b00afa2a4f7c013cbd1a2a109a8deacd6921cb0ee145a9b4a8 From 743655f6ac37127f4e0b42db9d8b20d164911676 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 1 Aug 2022 18:13:35 +0100 Subject: [PATCH 11/13] Disable libguestfs tests in F36 because https://bugzilla.redhat.com/show_bug.cgi?id=2113008 --- nbdkit.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nbdkit.spec b/nbdkit.spec index 4105406..c4a3bf4 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -11,7 +11,9 @@ # This seems to require changes in libguestfs and/or qemu to support # -cpu max or -cpu virt. # s390x builders can't run libguestfs -%ifnarch %{power64} riscv64 s390 s390x +# x86-64 broken in F36: +# https://bugzilla.redhat.com/show_bug.cgi?id=2113008 +%ifnarch %{power64} riscv64 s390 s390x x86_64 %global have_libguestfs 1 %endif %endif From 29bd1dd5b001fe8ba514fe4cd46fec844a191340 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 1 Aug 2022 18:48:49 +0100 Subject: [PATCH 12/13] Revert "Disable libguestfs tests in F36 because" This reverts commit 743655f6ac37127f4e0b42db9d8b20d164911676. --- nbdkit.spec | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index c4a3bf4..a9772ef 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -11,9 +11,7 @@ # This seems to require changes in libguestfs and/or qemu to support # -cpu max or -cpu virt. # s390x builders can't run libguestfs -# x86-64 broken in F36: -# https://bugzilla.redhat.com/show_bug.cgi?id=2113008 -%ifnarch %{power64} riscv64 s390 s390x x86_64 +%ifnarch %{power64} riscv64 s390 s390x %global have_libguestfs 1 %endif %endif @@ -55,7 +53,7 @@ ExclusiveArch: x86_64 Name: nbdkit Version: 1.30.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD server License: BSD @@ -1173,7 +1171,7 @@ export LIBGUESTFS_TRACE=1 %changelog -* Tue Jul 19 2022 Richard W.M. Jones - 1.30.9-1 +* Tue Jul 19 2022 Richard W.M. Jones - 1.30.9-2 - New stable version 1.30.9 * Tue Jul 19 2022 Richard W.M. Jones - 1.30.8-1 From 18250e260562f9261be0d1d882d4af785a28c4ac Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 14 Oct 2022 18:22:48 +0100 Subject: [PATCH 13/13] New stable version 1.30.10 --- nbdkit.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index a9772ef..dfb52ae 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -52,8 +52,8 @@ ExclusiveArch: x86_64 %global source_directory 1.30-stable Name: nbdkit -Version: 1.30.9 -Release: 2%{?dist} +Version: 1.30.10 +Release: 1%{?dist} Summary: NBD server License: BSD @@ -1171,6 +1171,9 @@ export LIBGUESTFS_TRACE=1 %changelog +* Fri Oct 14 2022 Richard W.M. Jones - 1.30.10-2 +- New stable version 1.30.10 + * Tue Jul 19 2022 Richard W.M. Jones - 1.30.9-2 - New stable version 1.30.9 diff --git a/sources b/sources index 4a6dba8..04d970c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.30.9.tar.gz) = aa5b443fde25763c225aea8fbfea82a82ccf3e65d45596989b1b5cc2912a4c7d3e4683d486b2d18ff85084a85de2f6b80355647d1a9f9138c4cb551b67a2a023 -SHA512 (nbdkit-1.30.9.tar.gz.sig) = c39a23bdb190eb7b0caf19da46c66dc75a5fe11aa56af9d6acb0215b0562d96154341c250d6f80b00afa2a4f7c013cbd1a2a109a8deacd6921cb0ee145a9b4a8 +SHA512 (nbdkit-1.30.10.tar.gz) = be6748f4e0da3068a7ea235943ceaa5f4e9b6db8afb763c3b90300cbc3e194ba54be5e2eacfc98ba479128f9705f6a6d58124819daa30254ce8bcac201d736fd +SHA512 (nbdkit-1.30.10.tar.gz.sig) = 389a426ac78e6acd35605eba428c6549f8f02f70ffb882dfc6baedb2dd9b38254e6e8d866ba494092d62ca7ebc7514ef30e592b2da25e7869ab00a3346b3222b