From 1b37833e61b85e9ea44039a4933dc57b5e671b16 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
Date: Wed, 29 Apr 2015 15:03:20 +0200
Subject: [PATCH] - up to 2.3.0

---
 qemu.spec | 13 ++++++-------
 x32.patch | 12 +-----------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/qemu.spec b/qemu.spec
index 47fbba8..20f2200 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -1,7 +1,6 @@
 #
 # Conditional build:
 %bcond_without	sdl		# SDL UI and audio support
-%bcond_without	glx		# OpenGL/GLX support
 %bcond_without	ceph		# Ceph/RBD support
 %bcond_without	glusterfs	# GlusterFS backend
 %bcond_without	rdma		# RDMA-based migration support
@@ -36,12 +35,12 @@
 Summary:	QEMU CPU Emulator
 Summary(pl.UTF-8):	QEMU - emulator procesora
 Name:		qemu
-Version:	2.2.0
-Release:	2
+Version:	2.3.0
+Release:	1
 License:	GPL v2+
 Group:		Applications/Emulators
 Source0:	http://wiki.qemu-project.org/download/%{name}-%{version}.tar.bz2
-# Source0-md5:	f7a5e2da22d057eb838a91da7aff43c8
+# Source0-md5:	2fab3ea4460de9b57192e5b8b311f221
 Source2:	%{name}.binfmt
 # Loads kvm kernel modules at boot
 Source3:	kvm-modules-load.conf
@@ -172,8 +171,9 @@ Requires:	gtk+3 >= 3.0.0 \
 %{?with_vte:Requires:	vte2.90 >= 0.32.0} \
 %endif
 
-# some PPC/SPARC boot image in ELF format
-%define		_noautostrip	.*%{_datadir}/qemu/.*-.*
+# don't strip/chrpath anything in there; these are boot images, roms etc
+%define		_noautostrip	.*%{_datadir}/qemu/.*
+%define		_noautochrpath	.*%{_datadir}/qemu/.*
 
 %description
 QEMU is a FAST! processor emulator. By using dynamic translation it
@@ -758,7 +758,6 @@ ln -s ../error.h qapi/error.h
 	--enable-fdt \
 	%{__enable_disable glusterfs} \
 	%{__enable_disable iscsi libiscsi} \
-	%{__enable_disable glx} \
 	%{__enable_disable ceph rbd} \
 	%{__enable_disable rdma} \
 	%{__enable_disable sdl} \
diff --git a/x32.patch b/x32.patch
index d8a60c9..07aa915 100644
--- a/x32.patch
+++ b/x32.patch
@@ -27,14 +27,4 @@
          "$targetos" != "Darwin" -a "$targetos" != "SunOS" -a \
          "$softmmu" = yes ; then
    roms="optionrom"
-@@ -5080,7 +5080,9 @@ case "$target_name" in
-       \( "$target_name" = "ppcemb" -a "$cpu" = "ppc64" \) -o \
-       \( "$target_name" = "mipsel" -a "$cpu" = "mips" \) -o \
-       \( "$target_name" = "x86_64" -a "$cpu" = "i386"   \) -o \
--      \( "$target_name" = "i386"   -a "$cpu" = "x86_64" \) \) ; then
-+      \( "$target_name" = "i386"   -a "$cpu" = "x86_64" \) -o \
-+      \( "$target_name" = "x86_64" -a "$cpu" = "x32"   \) -o \
-+      \( "$target_name" = "i386"   -a "$cpu" = "x32" \) \) ; then
-       echo "CONFIG_KVM=y" >> $config_target_mak
-       if test "$vhost_net" = "yes" ; then
-         echo "CONFIG_VHOST_NET=y" >> $config_target_mak
+
-- 
2.44.0