From: Jan Palus <atler@pld-linux.org>
Date: Tue, 14 Aug 2018 22:34:35 +0000 (+0200)
Subject: up to 3.0.0
X-Git-Tag: auto/th/qemu-3.0.0-1
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fqemu.git;a=commitdiff_plain;h=a782bf0f5ca4aeb640f316003f68ba2325fb79cd

up to 3.0.0

- looks like vgabios is gone
---

diff --git a/qemu.spec b/qemu.spec
index 762e3aa..d364140 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -37,12 +37,12 @@
 Summary:	QEMU CPU Emulator
 Summary(pl.UTF-8):	QEMU - emulator procesora
 Name:		qemu
-Version:	2.12.1
+Version:	3.0.0
 Release:	1
 License:	GPL v2
 Group:		Applications/Emulators
 Source0:	http://wiki.qemu-project.org/download/%{name}-%{version}.tar.xz
-# Source0-md5:	6e830a88e36908d9563ed01131ce72ec
+# Source0-md5:	6a5c8df583406ea24ef25b239c3243e0
 Source2:	%{name}.binfmt
 # Loads kvm kernel modules at boot
 Source3:	kvm-modules-load.conf
@@ -58,12 +58,11 @@ Source10:	ksmtuned.conf
 Source11:	%{name}-guest-agent.service
 Source12:	99-%{name}-guest-agent.rules
 Patch0:		%{name}-cflags.patch
-Patch1:		vgabios-widescreens.patch
-Patch2:		%{name}-whitelist.patch
-Patch3:		%{name}-user-execve.patch
-Patch4:		%{name}-xattr.patch
-Patch5:		libjpeg-boolean.patch
-Patch6:		x32.patch
+Patch1:		%{name}-whitelist.patch
+Patch2:		%{name}-user-execve.patch
+Patch3:		%{name}-xattr.patch
+Patch4:		libjpeg-boolean.patch
+Patch5:		x32.patch
 URL:		http://www.qemu-project.org/
 %{?with_gl:BuildRequires:	OpenGL-GLX-devel}
 %{?with_gl:BuildRequires:	OpenGL-devel}
@@ -833,12 +832,11 @@ Moduł QEMU dla urządeń blokowych typu 'ssh'.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p0
+%patch1 -p0
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 # workaround for conflict with alsa/error.h
 ln -s ../error.h qapi/error.h
@@ -938,9 +936,6 @@ build static \
 
 %endif
 
-# rebuild patched vesa tables with additional widescreen modes.
-%{__make} -C roms/vgabios stdvga-bios
-
 %{__cc} %{SOURCE7} %{rpmcflags} -o ksmctl
 
 %install
@@ -1048,9 +1043,6 @@ done < %{SOURCE2}
 # packaged as %doc
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/qemu/qemu-doc.html
 
-# install patched vesa tables with additional widescreen modes.
-cp -p roms/vgabios/VGABIOS-lgpl-latest.stdvga.bin $RPM_BUILD_ROOT%{_datadir}/%{name}/vgabios-stdvga.bin
-
 %if %{with system_seabios}
 ln -sf /usr/share/seabios/bios.bin $RPM_BUILD_ROOT%{_datadir}/%{name}/bios-256k.bin
 # bios.bin provided by qemu is stripped to 128k, with no Xen support, keep it