From d4c45075335265d7f03d6f79ffd6b8d49580c435 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Jul 31 2018 20:36:31 +0000
Subject: Rebase to qemu-3.0.0-rc3


Drop now unneeded s390x conf (bz #1609706)

---

diff --git a/.gitignore b/.gitignore
index 793c8ea..c275aa8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
 /qemu-2.12.0-rc2.tar.xz
 /qemu-2.12.0-rc3.tar.xz
 /qemu-2.12.0.tar.xz
+/qemu-3.0.0-rc3.tar.xz
diff --git a/50-kvm-s390x.conf b/50-kvm-s390x.conf
deleted file mode 100644
index 0df7f0d..0000000
--- a/50-kvm-s390x.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# KVM S390 VM creation fails without this set
-# https://www.mail-archive.com/kvm@vger.kernel.org/msg115576.html
-vm.allocate_pgste = 1
diff --git a/qemu.spec b/qemu.spec
index 6f576ee..99e8bc8 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -94,7 +94,7 @@ Requires: %{name}-ui-sdl = %{epoch}:%{version}-%{release}
 
 
 # Release candidate version tracking
-#global rcver rc3
+%global rcver rc3
 %if 0%{?rcver:1}
 %global rcrel .%{rcver}
 %global rcstr -%{rcver}
@@ -103,8 +103,8 @@ Requires: %{name}-ui-sdl = %{epoch}:%{version}-%{release}
 
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
-Version: 2.12.0
-Release: 4%{?rcrel}%{?dist}
+Version: 3.0.0
+Release: 0.1%{?rcrel}%{?dist}
 Epoch: 2
 License: GPLv2 and BSD and MIT and CC-BY
 URL: http://www.qemu.org/
@@ -132,17 +132,8 @@ Source14: qemu-pr-helper.service
 Source15: qemu-pr-helper.socket
 # /etc/modprobe.d/kvm.conf
 Source20: kvm.conf
-# /etc/sysctl.d/50-kvm-s390x.conf
-Source21: 50-kvm-s390x.conf
 # /etc/security/limits.d/95-kvm-ppc64-memlock.conf
-Source22: 95-kvm-ppc64-memlock.conf
-
-# Fix qxl memslot_get_virt crashes (bz #1565354)
-Patch0001: 0001-qxl-fix-local-renderer-crash.patch
-
-Patch0002: 0001-i386-define-the-ssbd-CPUID-feature-bit-CVE-2018-3639.patch
-Patch0003: 0002-i386-Define-the-Virt-SSBD-MSR-and-handling-of-it-CVE.patch
-Patch0004: 0003-i386-define-the-AMD-virt-ssbd-CPUID-feature-bit-CVE-.patch
+Source21: 95-kvm-ppc64-memlock.conf
 
 
 
@@ -878,9 +869,9 @@ run_configure() {
         --prefix=%{_prefix} \
         --libdir=%{_libdir} \
         --sysconfdir=%{_sysconfdir} \
-        --interp-prefix=%{_prefix}/qemu-%%M \
         --localstatedir=%{_localstatedir} \
         --libexecdir=%{_libexecdir} \
+        --interp-prefix=%{_prefix}/qemu-%%M \
         --with-pkgversion=%{name}-%{version}-%{release} \
         --disable-strip \
         --disable-werror \
@@ -1672,6 +1663,10 @@ getent passwd qemu >/dev/null || \
 
 
 %changelog
+* Tue Jul 31 2018 Cole Robinson <crobinso@redhat.com> - 2:3.0.0-0.1.rc3
+- Rebase to qemu-3.0.0-rc3
+- Drop now unneeded s390x conf (bz #1609706)
+
 * Fri Jul 13 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2:2.12.0-4
 - Rebuild for Xen 4.11
 
diff --git a/sources b/sources
index 4cc5147..46ca94a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qemu-2.12.0.tar.xz) = dda057c52cf5fe460b029448049266ace061d21fb5f1cf71a6a37f67b3b7fc3350f6712bf22803fc38fa91f0bd438896ba01b5817b3b94ba9b6925aeaae053b7
+SHA512 (qemu-3.0.0-rc3.tar.xz) = e1483c8fd0bc5e4fb2298e5afcf60ea82934a2b4569a5e19d8ae29ebc1ae19a6d192d8d24a3c0c1af807a0da755c05c2ae0e1624a1e727891005937a81eed106