From 8055ee2da9c0bc323a5c39f3f1a9a80e83a629b2 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Sun, 22 Mar 2015 10:59:08 -0400
Subject: [PATCH] Rebase to qemu-2.3.0-rc0

---
 qemu.spec | 51 ++++++++++++---------------------------------------
 sources   |  2 +-
 2 files changed, 13 insertions(+), 40 deletions(-)

diff --git a/qemu.spec b/qemu.spec
index 6a297d0..f99b136 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -152,8 +152,8 @@
 
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
-Version: 2.2.0
-Release: 7%{?dist}
+Version: 2.3.0
+Release: 0.1.rc0%{?dist}
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
 Group: Development/Tools
@@ -168,7 +168,8 @@ ExclusiveArch: %{kvm_archs}
 %define _smp_mflags %{nil}
 %endif
 
-Source0: http://wiki.qemu-project.org/download/%{name}-%{version}.tar.bz2
+#Source0: http://wiki.qemu-project.org/download/%{name}-%{version}.tar.bz2
+Source0: http://wiki.qemu-project.org/download/%{name}-%{version}-rc0.tar.bz2
 
 Source1: qemu.binfmt
 
@@ -193,25 +194,6 @@ Source12: bridge.conf
 # qemu-kvm back compat wrapper
 Source13: qemu-kvm.sh
 
-Patch0000: 0001-libcacard-stop-linking-against-every-single-3rd-part.patch
-
-# Add UEFI support for aarch64.  Upstream in qemu > 2.2.0.
-Patch0001: 0001-fw_cfg-remove-superfluous-blank-line.patch
-Patch0002: 0002-hw-arm-boot-fix-uninitialized-scalar-variable-warnin.patch
-Patch0003: 0003-Sort-include-qemu-typedefs.h.patch
-Patch0004: 0004-fw_cfg-hard-separation-between-the-MMIO-and-I-O-port.patch
-Patch0005: 0005-fw_cfg-move-boards-to-fw_cfg_init_io-fw_cfg_init_mem.patch
-Patch0006: 0006-fw_cfg_mem-max-access-size-and-region-size-are-the-s.patch
-Patch0007: 0007-fw_cfg_mem-flip-ctl_mem_ops-and-data_mem_ops-to-DEVI.patch
-Patch0008: 0008-exec-allows-8-byte-accesses-in-subpage_ops.patch
-Patch0009: 0009-fw_cfg_mem-introduce-the-data_width-property.patch
-Patch0010: 0010-fw_cfg_mem-expose-the-data_width-property-with-fw_cf.patch
-Patch0011: 0011-arm-add-fw_cfg-to-virt-board.patch
-Patch0012: 0012-hw-loader-split-out-load_image_gzipped_buffer.patch
-Patch0013: 0013-hw-arm-pass-pristine-kernel-image-to-guest-firmware-.patch
-Patch0014: 0014-hw-arm-virt-enable-passing-of-EFI-stubbed-kernel-to-.patch
-Patch0015: 0015-fw_cfg-fix-endianness-in-fw_cfg_data_mem_read-_write.patch
-
 BuildRequires: SDL2-devel
 BuildRequires: zlib-devel
 BuildRequires: which
@@ -310,6 +292,10 @@ BuildRequires: xen-devel
 # memdev hostmem backend added in 2.1
 BuildRequires: numactl-devel
 %endif
+# Added in qemu 2.3
+BuildRequires: bzip2-devel
+#
+
 
 %if 0%{?user:1}
 Requires: %{name}-%{user} = %{epoch}:%{version}-%{release}
@@ -750,23 +736,7 @@ CAC emulation development files.
 
 
 %prep
-%setup -q -n qemu-2.2.0
-%patch0000 -p1
-%patch0001 -p1
-%patch0002 -p1
-%patch0003 -p1
-%patch0004 -p1
-%patch0005 -p1
-%patch0006 -p1
-%patch0007 -p1
-%patch0008 -p1
-%patch0009 -p1
-%patch0010 -p1
-%patch0011 -p1
-%patch0012 -p1
-%patch0013 -p1
-%patch0014 -p1
-%patch0015 -p1
+%setup -q -n qemu-%{version}-rc0
 
 %build
 %if %{with kvmonly}
@@ -1544,6 +1514,9 @@ getent passwd qemu >/dev/null || \
 %endif
 
 %changelog
+* Sun Mar 22 2015 Cole Robinson <crobinso@redhat.com> - 2:2.3.0-0.1.rc0
+- Rebased to version 2.3.0-rc0
+
 * Tue Feb 17 2015 Richard W.M. Jones <rjones@redhat.com> - 2:2.2.0-7
 - Add -fPIC flag to build to avoid
   'relocation R_X86_64_PC32 against undefined symbol' errors.
diff --git a/sources b/sources
index 3584472..d429804 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f7a5e2da22d057eb838a91da7aff43c8  qemu-2.2.0.tar.bz2
+6c748ce737a42021f30d6c7a3248c2b5  qemu-2.3.0-rc0.tar.bz2