From 3c0f9e810a0b22b439681cedcba6073a20f13d88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Date: Fri, 4 Sep 2020 10:04:15 +0100
Subject: [PATCH] Drop references to obsolete arches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

s390, ppc, ppc64 and mips64 are no longer valid Fedora primary
or alternative architectures.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 qemu.spec | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/qemu.spec b/qemu.spec
index 6d5b368..ac02483 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -33,7 +33,7 @@
 
 # Matches numactl ExcludeArch
 %global have_numactl 1
-%ifarch s390 %{arm}
+%ifarch %{arm}
 %global have_numactl 0
 %endif
 
@@ -43,7 +43,7 @@
 #
 # https://bugzilla.redhat.com/show_bug.cgi?id=1332449
 %global have_iasl 1
-%ifnarch s390 s390x ppc ppc64
+%ifnarch s390x
 %global have_iasl 0
 %endif
 
@@ -170,7 +170,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 5.1.0
-Release: 4%{?rcrel}%{?dist}
+Release: 5%{?rcrel}%{?dist}
 Epoch: 2
 License: GPLv2 and BSD and MIT and CC-BY
 URL: http://www.qemu.org/
@@ -1002,14 +1002,8 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" scripts/qemu-trace-stap
 # Disable LTO since it caused lots of strange assert failures.
 %define _lto_cflags %{nil}
 
-# drop -g flag to prevent memory exhaustion by linker
-%ifarch s390
-%global optflags %(echo %{optflags} | sed 's/-g//')
-sed -i.debug 's/"-g $CFLAGS"/"$CFLAGS"/g' configure
-%endif
-
 # OOM killer breaks builds with parallel make on s390(x)
-%ifarch s390 s390x
+%ifarch s390x
 %global _smp_mflags %{nil}
 %endif
 
@@ -1198,9 +1192,6 @@ run_configure \
     --enable-modules \
     --enable-mpath \
     %{spiceflag} \
-%ifarch s390 %{mips64}
-    --enable-tcg-interpreter \
-%endif
     --enable-slirp=system
 
 echo "config-host.mak contents:"
@@ -1399,13 +1390,6 @@ chmod +x %{buildroot}%{_libdir}/qemu/*.so
 # Enable this temporarily if tests are broken
 %global tests_nofail 0
 
-# Tests are hanging on s390 as of 2.3.0
-#   https://bugzilla.redhat.com/show_bug.cgi?id=1206057
-# Tests seem to be a recurring problem on s390, leave them disabled.
-%ifarch s390
-%global tests_skip 1
-%endif
-
 # 2020-08-31: tests passing, but s390x fails due to
 # spurious warning breaking an iotest case
 # https://lists.gnu.org/archive/html/qemu-devel/2020-08/msg03279.html
@@ -1908,6 +1892,9 @@ getent passwd qemu >/dev/null || \
 
 
 %changelog
+* Fri Sep  4 2020 Daniel P. Berrangé <berrange@redhat.com> - 5.1.0-5
+- Drop conditions for ppc, ppc64, mips64 and s390 arches
+
 * Thu Sep  3 2020 Daniel P. Berrangé <berrange@redhat.com> - 5.1.0-4
 - Add btrfs ioctls to linux-user (rhbz #1872918)