From 1ca92711ab7f4614cebf1afec9f73a261f770028 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@fedoraproject.org>
Date: Jun 08 2006 10:17:29 +0000
Subject: fix modify_ldt too to make i386 build


---

diff --git a/qemu-0.8.1-syscall-macros.patch b/qemu-0.8.1-syscall-macros.patch
index 965afc1..9fbd433 100644
--- a/qemu-0.8.1-syscall-macros.patch
+++ b/qemu-0.8.1-syscall-macros.patch
@@ -173,3 +173,17 @@
  
  #define __NR_sys_uname __NR_uname
  #define __NR_sys_getcwd1 __NR_getcwd
+--- qemu-0.8.1/target-i386/helper2.c.orig	2006-06-08 11:09:41.000000000 +0100
++++ qemu-0.8.1/target-i386/helper2.c	2006-06-08 11:10:30.000000000 +0100
+@@ -35,7 +35,10 @@
+ #include <linux/unistd.h>
+ #include <linux/version.h>
+ 
+-_syscall3(int, modify_ldt, int, func, void *, ptr, unsigned long, bytecount)
++int modify_ldt(int func, void *ptr, unsigned long bytecount)
++{
++	return syscall(__NR_modify_ldt, func, ptr, bytecount);
++}
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 66)
+ #define modify_ldt_ldt_s user_desc
diff --git a/qemu.spec b/qemu.spec
index bee1835..78e3d4c 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.8.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL/LGPL
 Group: Development/Tools
@@ -11,7 +11,7 @@ Source1: qemu.init
 Patch0: qemu-0.7.0-build.patch
 Patch1: qemu-0.8.0-sdata.patch
 Patch2: qemu-0.8.1-syscall-macros.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel compat-gcc-32 zlib-devel texi2html
 PreReq: /sbin/chkconfig
 PreReq: /sbin/service
@@ -82,7 +82,10 @@ fi
 %config %{_sysconfdir}/rc.d/init.d/qemu
 
 %changelog
-* Wed Jun 7 2006 David Woodhouse <dwmw2@infradead.org> 0.8.1-2
+* Thu Jun  8 2006 David Woodhouse <dwmw2@infradead.org> 0.8.1-3
+- More header abuse in modify_ldt(), change BuildRoot:
+
+* Wed Jun  7 2006 David Woodhouse <dwmw2@infradead.org> 0.8.1-2
 - Fix up kernel header abuse
 
 * Tue May 30 2006 David Woodhouse <dwmw2@infradead.org> 0.8.1-1