From 3249e25ed19149d6817edcd9431e3f9a79e07510 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Fri, 29 Jan 2021 17:55:47 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/libnbd.git#e4160545b0e905841907a0aa7108f0bf9a3f3e55 --- libnbd.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index e1666f9..8850d03 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -9,7 +9,7 @@ Name: libnbd Version: 1.7.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -63,14 +63,14 @@ BuildRequires: gcc-c++ BuildRequires: gnutls-utils BuildRequires: jq BuildRequires: nbd -BuildRequires: qemu-img BuildRequires: util-linux -# On RHEL, maybe even in Fedora in future, we do not build nbdkit for -# i686. nbdkit is only needed for the test suite so make it optional. -# This reduces our test exposure on 32 bit platforms, although there -# is still Fedora/armv7 and some upstream testing. +# On RHEL, maybe even in Fedora in future, we do not build qemu-img or +# nbdkit for i686. These are only needed for the test suite so make +# them optional. This reduces our test exposure on 32 bit platforms, +# although there is still Fedora/armv7 and some upstream testing. %ifnarch %{ix86} +BuildRequires: qemu-img BuildRequires: nbdkit BuildRequires: nbdkit-data-plugin BuildRequires: nbdkit-eval-plugin @@ -299,6 +299,9 @@ make %{?_smp_mflags} check || { %changelog +* Fri Jan 29 2021 Richard W.M. Jones - 1.7.1-5 +- Disable BR qemu-img on i686. + * Thu Jan 28 2021 Richard W.M. Jones - 1.7.1-3 - Disable BR nbdkit on i686 because it breaks ELN/RHEL 9.