From 7ffd7f7fdf064e9c4c96d87a2ea860420b3ab828 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Date: Fri, 31 Jul 2020 10:51:50 +0100
Subject: [PATCH] Remove obsolete fedora conditionals (PR#9)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/qemu.spec b/qemu.spec
index edfa4b5..aac4f50 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -161,7 +161,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 5.0.0
-Release: 5%{?rcrel}%{?dist}
+Release: 6%{?rcrel}%{?dist}
 Epoch: 2
 License: GPLv2 and BSD and MIT and CC-BY
 URL: http://www.qemu.org/
@@ -321,15 +321,9 @@ BuildRequires: libudev-devel
 # qemu 4.0: Use for qauth infrastructure
 BuildRequires: pam-devel
 # qemu 4.0: user-mode networking
-%if 0%{?fedora} > 30
 BuildRequires: libslirp-devel
-%endif
 # qemu 4.0: sphinx-build used for some docs
-%if 0%{?fedora} > 30
 BuildRequires: python3-sphinx
-%else
-BuildRequires: python2-sphinx
-%endif
 # qemu 4.0: Used by test suite ./scripts/tap-driver.pl
 BuildRequires: perl-Test-Harness
 # Required for making python shebangs versioned
@@ -1150,9 +1144,7 @@ run_configure \
 %ifarch s390 %{mips64}
     --enable-tcg-interpreter \
 %endif
-%if 0%{?fedora} > 30
-    --enable-slirp=system \
-%endif
+    --enable-slirp=system
 
 echo "config-host.mak contents:"
 echo "==="
@@ -1844,6 +1836,9 @@ getent passwd qemu >/dev/null || \
 
 
 %changelog
+* Fri Jul 31 2020 Daniel P. Berrangé <berrange@redhat.com> - 5.0.0-6
+- Remove obsolete Fedora conditionals (PR#9)
+
 * Thu Jul 30 2020 Richard W.M. Jones <rjones@redhat.com> - 5.0.0-5
 - Disable LTO as it caused many strange assert failures.