- workaround for conflict with alsa/error.h

[packages/qemu.git] / qemu.spec

diff --git a/qemu.spec b/qemu.spec
index dd76e55af34da89037a69558f6f843f3e157e173..257e4dace14edaaafc6724a8cf538ff5e1035bef 100644 (file)
--- a/qemu.spec
+++ b/qemu.spec
@@ -3,6 +3,7 @@
 # - qemu-system-ppc -hda ac-ppc.img says:
 #   qemu: could not open disk image ac-ppc.img: Success
 #   qemu-0.12.2-2.x86_64.rpm - broken
+#   qemu-0.12.3-3.x86_64/qemu-0.12.4-1.x86_64 - stops on "returning from prom_init"
 #   qemu-0.11.1-7k.x86_64.rpm - OK
 #
 # Conditional build:
@@ -13,13 +14,14 @@
 Summary:       QEMU CPU Emulator
 Summary(pl.UTF-8):     QEMU - emulator procesora
 Name:          qemu
-Version:       0.12.4
+Version:       0.15.1
 Release:       1
 License:       GPL
 Group:         Applications/Emulators
 # Source0Download: http://fabrice.bellard.free.fr/qemu/download.html
-Source0:       http://download.savannah.gnu.org/releases/qemu/%{name}-%{version}.tar.gz
-# Source0-md5: 93e6b134dff89b2799f57b7d9e0e0fc5
+#Source0:      http://download.savannah.gnu.org/releases/qemu/%{name}-%{version}.tar.gz
+Source0:       http://wiki.qemu.org/download/%{name}-%{version}.tar.gz
+# Source0-md5: 34f17737baaf1b3495c89cd6d4a607ed
 Patch0:                %{name}-ncurses.patch
 Patch6:                %{name}-nosdlgui.patch
 # Proof of concept, for reference, do not remove
@@ -32,7 +34,7 @@ Patch15:      %{name}-isa-bios-ram.patch
 # which affects coreboot/linuxbios
 Patch16:       %{name}-piix-ram-size.patch
 Patch17:       %{name}-whitelist.patch
-URL:           http://www.nongnu.org/qemu/
+URL:           http://wiki.qemu.org/Index.html
 BuildRequires: SDL-devel >= 1.2.1
 BuildRequires: alsa-lib-devel
 BuildRequires: bluez-libs-devel
@@ -96,11 +98,14 @@ aby działał na kolejnych procesorach. QEMU ma dwa tryby pracy:
 
 # cannot use optflags on x86 - they cause "no register to spill" errors
 %if %{with cflags_passing}
-%{__sed} -i -e 's/-Wall -O2 -g/-Wall %{rpmcflags}/' Makefile Makefile.target
+%{__sed} -i -e 's/-g $CFLAGS/-Wall %{rpmcflags}/' configure
 %else
-%{__sed} -i 's/-Wall -O2 -g/-Wall -O2/' Makefile Makefile.target
+%{__sed} -i 's/-g $CFLAGS/-Wall -fno-var-tracking-assignments/' configure
 %endif
 
+# workaround for conflict with alsa/error.h
+ln -s ../error.h qapi/error.h
+
 %build
 # --extra-cflags don't work (overridden by CFLAGS in Makefile*)
 # they can be passed if the cflags_passing bcond is used
@@ -108,7 +113,6 @@ aby działał na kolejnych procesorach. QEMU ma dwa tryby pracy:
        --prefix=%{_prefix} \
        --cc="%{__cc}" \
        --host-cc="%{__cc}" \
-       --make="%{__make}" \
        --enable-mixemu \
        --audio-drv-list="alsa" \
        --interp-prefix=%{_libdir}/%{name}