From 0b61e57fbeb6d77062cf3894ed3d6d9df0316a3c Mon Sep 17 00:00:00 2001 From: Daniel P. Berrangé Date: Nov 13 2020 11:26:40 +0000 Subject: Disable static user mode build on RHEL The ELN stream builds Fedora packages in a psuedo-RHEL build root and does not ship all the things that Fedora expects to be present. In particular glib2-static is missing in ELN build roots, so we need to disable the user mode static build. Signed-off-by: Daniel P. Berrangé --- diff --git a/qemu.spec b/qemu.spec index 61e352b..d68b0c5 100644 --- a/qemu.spec +++ b/qemu.spec @@ -25,6 +25,9 @@ %endif %global user_static 1 +%if 0%{?rhel} +%global user_static 0 +%endif %global have_kvm 0 %if 0%{?kvm_package:1} @@ -213,7 +216,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 5.2.0 -Release: 0.2%{?rcrel}%{?dist} +Release: 0.3%{?rcrel}%{?dist} Epoch: 2 License: GPLv2 and BSD and MIT and CC-BY URL: http://www.qemu.org/ @@ -378,7 +381,9 @@ BuildRequires: daxctl-devel # used by some linux user impls BuildRequires: libdrm-devel +%if %{user_static} BuildRequires: glibc-static pcre-static glib2-static zlib-static +%endif Requires: %{name}-user = %{epoch}:%{version}-%{release} @@ -1903,6 +1908,9 @@ getent passwd qemu >/dev/null || \ %changelog +* Fri Nov 13 2020 Daniel P. Berrangé - 5.2.0-0.3.rc1 +- Disable user mode static builds in ELN + * Wed Nov 11 2020 Cole Robinson - 5.2.0-0.2.rc1 - Rebase to qemu-5.2.0-rc1