SPECS: qemu.spec - use gcc4 by default (HEAD if for Th) - added do...

[pascalek]

Author: pascalek                     Date: Wed Mar 14 12:05:31 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use gcc4 by default (HEAD if for Th)
- added dosguest patch with dosguest bcond

---- Files affected:
SPECS:
   qemu.spec (1.84 -> 1.85) 

---- Diffs:

================================================================
Index: SPECS/qemu.spec
diff -u SPECS/qemu.spec:1.84 SPECS/qemu.spec:1.85
--- SPECS/qemu.spec:1.84	Tue Mar 13 10:13:06 2007
+++ SPECS/qemu.spec	Wed Mar 14 13:05:25 2007
@@ -6,9 +6,10 @@
 # Conditional build:
 %bcond_without	kqemu			# disable KQEMU ACCELERATOR support in QEMU
 %bcond_with	cflags_passing		# with passing rpmcflags to Makefiles
+%bcond_with	dosguest		# add special patch when use with DOS as guest os
 %bcond_with	nosdlgui		# do not use SDL gui (use X11 instead)
 # Note that gcc4 build is very problematic and not supported by qemu team
-%bcond_with	gcc4			# use gcc4 patches (broke build on gcc33)
+%bcond_without	gcc4			# use gcc4 patches (broke build on gcc33)
 %bcond_without	dist_kernel		# without distribution kernel
 %bcond_without	kernel			# build kqemu KERNEL MODULES
 %bcond_without	up			# don't build up module
@@ -43,6 +44,7 @@
 Patch9:		%{name}-0.8.0-gcc4-hacks.patch
 Patch11:	%{name}-0.7.2-gcc4-opts.patch
 #Patch12:	%{name}-0.7.2-dyngen-check-stack-clobbers.patch
+Patch13:	%{name}-dosguest.patch
 URL:		http://fabrice.bellard.free.fr/qemu/
 %if %{with kernel} && %{with dist_kernel}
 BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7
@@ -177,6 +179,10 @@
 EOF
 %endif
 
+%if %{with dosguest}
+%patch13 -p1
+%endif
+
 %build
 %if %{with kernel}
 cd kqemu-%{_kqemu_version}
@@ -320,6 +326,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.85  2007/03/14 12:05:25  pascalek
+- use gcc4 by default (HEAD if for Th)
+- added dosguest patch with dosguest bcond
+
 Revision 1.84  2007/03/13 09:13:06  glen
 - allow only userspace build
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/qemu.spec?r1=1.84&r2=1.85&f=u