rpms/qemu/devel qemu-0.8.2-kernheaders.patch, NONE, 1.1 qemu.spec, 1.16, 1.17

Matthias Saou (thias) fedora-extras-commits at redhat.com
Wed Aug 23 17:34:19 UTC 2006


Author: thias

Update of /cvs/extras/rpms/qemu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18807

Modified Files:
	qemu.spec 
Added Files:
	qemu-0.8.2-kernheaders.patch 
Log Message:
Add kernheaders patch to fix linux/compiler.h inclusion.


qemu-0.8.2-kernheaders.patch:

--- NEW FILE qemu-0.8.2-kernheaders.patch ---
diff -Naupr qemu-0.8.2.orig/usb-linux.c qemu-0.8.2/usb-linux.c
--- qemu-0.8.2.orig/usb-linux.c	2006-07-22 19:23:34.000000000 +0200
+++ qemu-0.8.2/usb-linux.c	2006-08-23 18:47:16.000000000 +0200
@@ -26,7 +26,6 @@
 #if defined(__linux__)
 #include <dirent.h>
 #include <sys/ioctl.h>
-#include <linux/compiler.h>
 #include <linux/usbdevice_fs.h>
 #include <linux/version.h>
 


Index: qemu.spec
===================================================================
RCS file: /cvs/extras/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- qemu.spec	23 Aug 2006 16:36:00 -0000	1.16
+++ qemu.spec	23 Aug 2006 17:34:19 -0000	1.17
@@ -9,6 +9,7 @@
 Source1: qemu.init
 Patch0: qemu-0.7.0-build.patch
 Patch1: qemu-0.8.0-sdata.patch
+Patch2: qemu-0.8.2-kernheaders.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel compat-gcc-34 zlib-devel which texi2html
 Requires(post): /sbin/chkconfig
@@ -33,6 +34,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 ./configure --prefix=%{_prefix} --interp-prefix=%{_prefix}/qemu-%%M \
@@ -92,6 +94,7 @@
 - Add which build requirement.
 - Don't include texi files in %%doc since we ship them in html.
 - Switch to using gcc34 on devel, FC5 still has gcc32.
+- Add kernheaders patch to fix linux/compiler.h inclusion.
 
 * Thu Jun  8 2006 David Woodhouse <dwmw2 at infradead.org> 0.8.1-3
 - More header abuse in modify_ldt(), change BuildRoot:




More information about the scm-commits mailing list