SPECS: qemu.spec - merge with AC-branch

[glen]

Author: glen                         Date: Mon Feb 11 14:10:14 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merge with AC-branch

---- Files affected:
SPECS:
   qemu.spec (1.102 -> 1.103) 

---- Diffs:

================================================================
Index: SPECS/qemu.spec
diff -u SPECS/qemu.spec:1.102 SPECS/qemu.spec:1.103
--- SPECS/qemu.spec:1.102	Mon Feb 11 12:32:48 2008
+++ SPECS/qemu.spec	Mon Feb 11 15:10:09 2008
@@ -62,6 +62,11 @@
 Patch11:	%{pname}-0.7.2-gcc4-opts.patch
 #Patch12:	%{pname}-0.7.2-dyngen-check-stack-clobbers.patch
 Patch13:	%{pname}-dosguest.patch
+Patch14:	%{pname}-ppc_old_binutils.patch
+Patch15:	%{pname}-isa-bios-ram.patch
+# below one fixes problems with passing ram size to bios/bootloader
+# which affects coreboot/linuxbios
+Patch16:	%{pname}-piix-ram-size.patch
 URL:		http://fabrice.bellard.free.fr/qemu/
 %if %{with kernel} && %{with dist_kernel}
 BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7
@@ -172,15 +177,22 @@
 KERNEL=="kqemu", NAME="%k", MODE="0666"
 EOF
 
+%if %{with dosguest}
+%patch13 -p1
+%endif
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+
 cd kqemu-%{kqemu_version}
 %{__sed} -i 's#include ../config-host.mak##' ./common/Makefile
 %ifarch %{x8664}
 %{__sed} -i 's/^#ARCH=x86_64/ARCH=x86_64/' ./common/Makefile
-%{__make} -j1 -C common
+%{__make} -C common -j1
 mv -f kqemu-mod-x86_64.o{,.bin}
 %else
 %{__sed} -i 's/^#ARCH=i386/ARCH=i386/' ./common/Makefile
-%{__make} -j1 -C common
+%{__make} -C common -j1
 mv -f kqemu-mod-i386.o{,.bin}
 %endif
 
@@ -195,10 +207,6 @@
 cd -
 %endif
 
-%if %{with dosguest}
-%patch13 -p1
-%endif
-
 %build
 %if %{with kernel}
 cd kqemu-%{kqemu_version}
@@ -299,6 +307,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.103  2008-02-11 14:10:09  glen
+- merge with AC-branch
+
 Revision 1.102  2008-02-11 11:32:48  arekm
 - rel 6
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/qemu.spec?r1=1.102&r2=1.103&f=u