X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=qemu.spec;h=fb5d67342f57085098a9148cd041b8f524581013;hb=226d38324fb95ab31f924dd5c1255e8775ed1e64;hp=b2b95c2d5cc32575dbe559d031cc2bbed1e3073d;hpb=5b46162c9c61bef967c3655141fa2de460d6abe1;p=packages%2Fqemu.git

diff --git a/qemu.spec b/qemu.spec
index b2b95c2..fb5d673 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -1,3 +1,4 @@
+# TODO: archipelago (libxseg) on bcond (GPL v3 vs v2-only conflict)
 #
 # Conditional build:
 %bcond_without	sdl		# SDL UI and audio support
@@ -6,7 +7,7 @@
 %bcond_without	rdma		# RDMA-based migration support
 %bcond_with	gtk2		# GTK+ 2.x instead of 3.x
 %bcond_without	gtk3		# Do not build GTK+ UI
-%bcond_with	vte		# VTE support in GTK+ UI
+%bcond_without	vte		# VTE support in GTK+ UI
 %bcond_without	spice		# SPICE support
 %bcond_with	esd		# EsounD audio support
 %bcond_without	oss		# OSS audio support
@@ -32,12 +33,11 @@ Summary:	QEMU CPU Emulator
 Summary(pl.UTF-8):	QEMU - emulator procesora
 Name:		qemu
 Version:	2.3.0
-Release:	1
-License:	GPL v2+
+Release:	3
+License:	GPL v2
 Group:		Applications/Emulators
 Source0:	http://wiki.qemu-project.org/download/%{name}-%{version}.tar.bz2
 # Source0-md5:	2fab3ea4460de9b57192e5b8b311f221
-Source2:	%{name}.binfmt
 # Loads kvm kernel modules at boot
 Source3:	kvm-modules-load.conf
 # Creates /dev/kvm
@@ -53,14 +53,17 @@ Patch2:		%{name}-whitelist.patch
 Patch3:		%{name}-system-libcacard.patch
 Patch4:		%{name}-xattr.patch
 Patch5:		libjpeg-boolean.patch
+Patch6:		CVE-2015-3456.patch
 # Proof of concept, for reference, do not remove
 Patch400:	%{name}-kde_virtual_workspaces_hack.patch
 URL:		http://www.qemu-project.org/
+BuildRequires:	OpenGL-GLX-devel
 %{?with_sdl:BuildRequires:	SDL2-devel >= 2.0}
 BuildRequires:	alsa-lib-devel
-BuildRequires:	bcc
+BuildRequires:	bcc >= 0.16.21-2
 %{?with_bluetooth:BuildRequires:	bluez-libs-devel}
 %{?with_brlapi:BuildRequires:	brlapi-devel}
+BuildRequires:	bzip2-devel
 %{?with_ceph:BuildRequires:	ceph-devel}
 BuildRequires:	curl-devel
 BuildRequires:	cyrus-sasl-devel >= 2
@@ -87,8 +90,10 @@ BuildRequires:	libuuid-devel
 BuildRequires:	lzo-devel >= 2
 BuildRequires:	ncurses-devel
 %{?with_smartcard:BuildRequires:	nss-devel >= 3.12.8}
+BuildRequires:	numactl-devel
 BuildRequires:	perl-Encode
 BuildRequires:	perl-tools-pod
+BuildRequires:	pixman-devel >= 0.21.8
 BuildRequires:	pkgconfig
 %{?with_pulseaudio:BuildRequires:	pulseaudio-devel}
 BuildRequires:	rpmbuild(macros) >= 1.644
@@ -149,6 +154,7 @@ Requires:	SDL2 \
 Requires:	libseccomp >= 2.1.0 \
 %endif \
 Requires:	libusb >= 1.0.13 \
+Requires:	pixman >= 0.21.8 \
 %if %{with usbredir} \
 Requires:	usbredir >= 0.6 \
 %endif \
@@ -161,9 +167,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/.*-.*
-%define		_noautochrpath	.*%{_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
@@ -714,6 +720,7 @@ Moduł QEMU dla urządeń blokowych typu 'ssh'.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %{__mv} libcacard libcacard-use-system-lib
 
@@ -814,27 +821,6 @@ install -p ksmctl $RPM_BUILD_ROOT%{_sbindir}
 install -p %{SOURCE9} $RPM_BUILD_ROOT%{_sbindir}/ksmtuned
 install -p %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/ksmtuned.conf
 
-for i in dummy \
-%ifnarch %{ix86} %{x8664}
-	qemu-i386 \
-%endif
-%ifnarch arm
-	qemu-arm \
-%endif
-%ifnarch ppc ppc64
-	qemu-ppc \
-%endif
-%ifnarch sparc sparc64
-	qemu-sparc \
-%endif
-%ifnarch sh4
-	qemu-sh4 \
-%endif
-; do
-	test $i = dummy && continue
-	grep /$i:\$ %{SOURCE2} > $RPM_BUILD_ROOT/usr/lib/binfmt.d/$i.conf
-done < %{SOURCE2}
-
 # packaged as %doc
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/qemu/qemu-{doc,tech}.html
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/qemu/qmp-commands.txt
@@ -876,14 +862,12 @@ if [ "$1" = "0" ]; then
 	%groupremove kvm
 fi
 
-%triggerpostun common -- qemu-common < 1.6.1-4
-
 %files
 %defattr(644,root,root,755)
 
 %files common -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README qemu-doc.html qemu-tech.html qmp-commands.txt
+%doc LICENSE README qemu-doc.html qemu-tech.html qmp-commands.txt
 %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/qemu-ifup
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/qemu/target-*.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/ksmtuned.conf
@@ -951,7 +935,6 @@ fi
 
 %files user
 %defattr(644,root,root,755)
-/usr/lib/binfmt.d/qemu-*.conf
 %attr(755,root,root) %{_bindir}/qemu-aarch64
 %attr(755,root,root) %{_bindir}/qemu-alpha
 %attr(755,root,root) %{_bindir}/qemu-arm