SPECS: qemu.spec - renumber patches - pass --kernel-path to config...

[glen]

Author: glen                         Date: Tue May 23 21:48:44 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- renumber patches
- pass --kernel-path to configure just to be sure

---- Files affected:
SPECS:
   qemu.spec (1.53 -> 1.54) 

---- Diffs:

================================================================
Index: SPECS/qemu.spec
diff -u SPECS/qemu.spec:1.53 SPECS/qemu.spec:1.54
--- SPECS/qemu.spec:1.53	Sat May 20 02:49:52 2006
+++ SPECS/qemu.spec	Tue May 23 23:48:39 2006
@@ -34,14 +34,12 @@
 Patch1:		%{name}-cc.patch
 Patch2:		%{name}-longjmp.patch
 Patch3:		%{name}-dot.patch
-
-Patch5:		%{name}-gcc4_x86.patch
-Patch6:		%{name}-gcc4_ppc.patch
-Patch7:		%{name}-parallel.patch
-Patch8:		%{name}-nosdlgui.patch
-Patch9:		%{name}-ifup.patch
-Patch10:	%{name}-gcc33.patch
-
+Patch4:		%{name}-gcc4_x86.patch
+Patch5:		%{name}-gcc4_ppc.patch
+Patch6:		%{name}-nosdlgui.patch
+Patch7:		%{name}-ifup.patch
+Patch8:	%{name}-gcc33.patch
+Patch9:		%{name}-parallel.patch
 URL:		http://fabrice.bellard.free.fr/qemu/
 BuildRequires:	SDL-devel >= 1.2.1
 BuildRequires:	alsa-lib-devel
@@ -130,16 +128,15 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-
 %if %{with gcc4}
-%patch5 -p0
-%patch6 -p1
+%patch4 -p0
+%patch5 -p1
 %endif
+%{?with_nosdlgui:%patch6 -p1}
+%patch7 -p1
+%patch8 -p1
 # probably not needed
-# %patch7 -p1
-%{?with_nosdlgui:%patch8 -p1}
-%patch9 -p1
-%patch10 -p1
+#%%patch9 -p1
 
 %{__sed} -i -e 's/sdl_static=yes/sdl_static=no/' configure
 %{__sed} -i 's/.*MAKE) -C kqemu$//' Makefile
@@ -209,8 +206,12 @@
 	--cc="%{__cc}" \
 	--host-cc="%{__cc}" \
 	--make="%{__make}" \
+%if %{with kqemu}
+	--kernel-path=%{_kernelsrcdir} \
+%else
+	--disable-kqemu \
+%endif
 	%{?with_gcc4:--disable-gcc-check} \
-	%{!?with_kqemu:--disable-kqemu} \
 	--enable-alsa \
 	--interp-prefix=%{_libdir}/%{name}
 %{__make}
@@ -307,6 +308,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.54  2006/05/23 21:48:39  glen
+- renumber patches
+- pass --kernel-path to configure just to be sure
+
 Revision 1.53  2006/05/20 00:49:52  glen
 - bconds can be confusing sometimes
 
================================================================

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