packages: qemu/qemu.spec - rel 1; qemu-kvm obsoleted

[arekm]

Author: arekm                        Date: Sun Dec  4 12:01:06 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 1; qemu-kvm obsoleted

---- Files affected:
packages/qemu:
   qemu.spec (1.185 -> 1.186) 

---- Diffs:

================================================================
Index: packages/qemu/qemu.spec
diff -u packages/qemu/qemu.spec:1.185 packages/qemu/qemu.spec:1.186
--- packages/qemu/qemu.spec:1.185	Fri Dec  2 01:10:08 2011
+++ packages/qemu/qemu.spec	Sun Dec  4 13:01:01 2011
@@ -16,7 +16,7 @@
 Summary(pl.UTF-8):	QEMU - emulator procesora
 Name:		qemu
 Version:	1.0
-Release:	0.1
+Release:	1
 License:	GPL
 Group:		Applications/Emulators
 # Source0Download: http://fabrice.bellard.free.fr/qemu/download.html
@@ -49,12 +49,13 @@
 BuildRequires:	which
 BuildRequires:	xorg-lib-libX11-devel
 Requires:	SDL >= 1.2.1
+Obsoletes:	qemu-kvm
 # sparc is currently unsupported (missing cpu_get_real_ticks() impl in vl.c)
 ExclusiveArch:	%{ix86} %{x8664} %{?with_userspace:ppc}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # some PPC/SPARC boot image in ELF format
-%define		_noautostrip	.*%{_datadir}/qemu/openbios-.*
+%define		_noautostrip	.*%{_datadir}/qemu/.*-.*
 
 %description
 QEMU is a FAST! processor emulator. By using dynamic translation it
@@ -111,6 +112,7 @@
 # --extra-cflags don't work (overridden by CFLAGS in Makefile*)
 # they can be passed if the cflags_passing bcond is used
 ./configure \
+	--sysconfdir=%{_sysconfdir} \
 	--prefix=%{_prefix} \
 	--cc="%{__cc}" \
 	--host-cc="%{__cc}" \
@@ -143,6 +145,8 @@
 %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/qemu-ifup
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/qemu
+%dir %{_sysconfdir}/qemu
+%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/qemu/target-*.conf
 %{_mandir}/man1/qemu.1*
 %{_mandir}/man1/qemu-img.1*
 %{_mandir}/man8/qemu-nbd.8*
@@ -153,6 +157,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.186  2011/12/04 12:01:01  arekm
+- rel 1; qemu-kvm obsoleted
+
 Revision 1.185  2011/12/02 00:10:08  wiget
 Start update to 1.0
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qemu/qemu.spec?r1=1.185&r2=1.186&f=u