From 7c0786d12efea8fd85ecd2b652ba86c126eaafb3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Sun, 4 Dec 2011 12:01:01 +0000 Subject: [PATCH] - rel 1; qemu-kvm obsoleted Changed files: qemu.spec -> 1.186 --- qemu.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/qemu.spec b/qemu.spec index d7915d9..a0adc5a 100644 --- a/qemu.spec +++ b/qemu.spec @@ -15,7 +15,7 @@ Summary: QEMU CPU Emulator 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 @@ -48,12 +48,13 @@ BuildRequires: texi2html 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 @@ -110,6 +111,7 @@ ln -s ../error.h qapi/error.h # --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}" \ @@ -142,6 +144,8 @@ rm -rf $RPM_BUILD_ROOT %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* -- 2.44.0