X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=qemu.spec;h=2ffeba6f1725ea7d122c53d34afb514596572eee;hb=f8ecc2ec0a18d2d6afc25597634616890396b1db;hp=be6c335f1f487ba9b37907b860ea9a173b788fad;hpb=1ffe7dfd72cf66d1e6505500cce8063140753077;p=packages%2Fqemu.git

diff --git a/qemu.spec b/qemu.spec
index be6c335..2ffeba6 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -1,4 +1,5 @@
 # TODO:
+# - merge missing bits from qemu-kvm
 # - --enable-glusterfs when glusterfs 3.4 is out
 # - qemu-system-ppc -hda ac-ppc.img says:
 #   qemu: could not open disk image ac-ppc.img: error "Success"
@@ -21,12 +22,12 @@
 Summary:	QEMU CPU Emulator
 Summary(pl.UTF-8):	QEMU - emulator procesora
 Name:		qemu
-Version:	1.3.0
+Version:	1.4.0
 Release:	0.1
 License:	GPL v2+
 Group:		Applications/Emulators
 Source0:	http://wiki.qemu-project.org/download/%{name}-%{version}.tar.bz2
-# Source0-md5:	a4030ddd2ba324152a97d65d3c0b247d
+# Source0-md5:	78f13b774814b6b7ebcaf4f9b9204318
 Patch0:		%{name}-cflags.patch
 Patch1:		vgabios-widescreens.patch
 Patch2:		%{name}-whitelist.patch
@@ -37,6 +38,7 @@ URL:		http://www.qemu-project.org/
 %{?with_opengl:BuildRequires:	OpenGL-GLX-devel}
 %{?with_sdl:BuildRequires:	SDL-devel >= 1.2.1}
 BuildRequires:	alsa-lib-devel
+BuildRequires:  bcc
 BuildRequires:	bluez-libs-devel
 BuildRequires:	brlapi-devel
 %{?with_ceph:BuildRequires:	ceph-devel}
@@ -62,10 +64,11 @@ BuildRequires:	perl-Encode
 BuildRequires:	perl-tools-pod
 BuildRequires:	pkgconfig
 %{?with_pulseaudio:BuildRequires:	pulseaudio-devel}
+BuildRequires:	rpmbuild(macros) >= 1.202
 BuildRequires:	sed >= 4.0
 %if %{with spice}
-BuildRequires:	spice-protocol >= 0.8.0
-BuildRequires:	spice-server-devel >= 0.8.2
+BuildRequires:	spice-protocol >= 0.12.0
+BuildRequires:	spice-server-devel >= 0.12.0
 %endif
 BuildRequires:	texi2html
 BuildRequires:	texinfo
@@ -138,6 +141,14 @@ Summary:	QEMU common files needed by all QEMU targets
 Summary(pl.UTF-8):	Wspólne pliki QEMU wymagane przez wszystkie środowiska QEMU
 Group:		Development/Tools
 Requires:	glib2 >= 1:2.12
+Requires(postun):	/usr/sbin/groupdel
+Requires(postun):	/usr/sbin/userdel
+Requires(pre):	/bin/id
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/usr/sbin/groupadd
+Requires(pre):	/usr/sbin/useradd
+Provides:	group(qemu)
+Provides:	user(qemu)
 Conflicts:	qemu < 1.0-2
 
 %description common
@@ -503,7 +514,6 @@ ln -s ../error.h qapi/error.h
 	%{__enable_disable sdl} \
 	--enable-seccomp \
 	%{__enable_disable spice} \
-	--enable-smartcard \
 	--enable-smartcard-nss \
 	--enable-usb-redir \
 	--enable-uuid \
@@ -549,6 +559,16 @@ cp -p roms/vgabios/VGABIOS-lgpl-latest.stdvga.bin $RPM_BUILD_ROOT%{_datadir}/%{n
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre common
+%groupadd -g 276 qemu
+%useradd -u 276 -g qemu -c "QEMU User" qemu
+
+%postun common
+if [ "$1" = "0" ]; then
+	%userremove qemu
+	%groupremove qemu
+fi
+
 %files
 %defattr(644,root,root,755)
 
@@ -569,6 +589,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/keymaps
 %{_datadir}/%{name}/qemu-icon.bmp
 # various bios images
+%{_datadir}/%{name}/*.aml
 %{_datadir}/%{name}/*.bin
 %{_datadir}/%{name}/*.rom
 %{_datadir}/%{name}/*.dtb