SPECS: VirtualBox.spec - fix build on x86_64; use newer xorg drivers

[arekm]

Author: arekm                        Date: Mon Apr 20 16:50:36 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix build on x86_64; use newer xorg drivers

---- Files affected:
SPECS:
   VirtualBox.spec (1.192 -> 1.193) 

---- Diffs:

================================================================
Index: SPECS/VirtualBox.spec
diff -u SPECS/VirtualBox.spec:1.192 SPECS/VirtualBox.spec:1.193
--- SPECS/VirtualBox.spec:1.192	Wed Apr 15 09:33:46 2009
+++ SPECS/VirtualBox.spec	Mon Apr 20 18:50:30 2009
@@ -47,9 +47,8 @@
 Source8:	%{pname}.sh
 Source9:	mount.vdi
 Patch0:		%{pname}-configure.patch
-Patch3:		%{pname}-disable-xclient-build.patch
-Patch4:		%{pname}-configure-spaces.patch
-Patch6:		%{pname}-vboxnetflt_export.patch
+Patch1:		%{pname}-configure-spaces.patch
+Patch2:		%{pname}-vboxnetflt_export.patch
 URL:		http://www.virtualbox.org/
 BuildRequires:	rpmbuild(macros) >= 1.379
 %if %{with userspace}
@@ -278,13 +277,8 @@
 %prep
 %setup -q -n %{pname}-%{version}_OSE
 %patch0 -p1
-
-%ifarch %{x8664}
-%patch3 -p1
-%endif
-
-%patch4 -p1
-%patch6 -p1
+%patch1 -p1
+%patch2 -p1
 
 cat <<'EOF' > udev.conf
 KERNEL=="vboxdrv", NAME="%k", GROUP="vbox", MODE="0660"
@@ -312,7 +306,7 @@
 	--disable-kmods
 
 . ./env.sh && \
-kmk -j1 %{?with_verbose:KBUILD_VERBOSE=3}
+kmk -j1 %{?with_verbose:KBUILD_VERBOSE=3} USER=$(id -un)
 %endif
 
 %if %{with kernel}
@@ -357,9 +351,9 @@
 	$RPM_BUILD_ROOT%{_bindir}
 
 install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,input}
-install out/linux.%{outdir}/release/bin/additions/vboxmouse_drv_15.so	\
+install out/linux.%{outdir}/release/bin/additions/vboxmouse_drv_16.so	\
 	$RPM_BUILD_ROOT%{_libdir}/xorg/modules/input/vboxmouse_drv.so
-install out/linux.%{outdir}/release/bin/additions/vboxvideo_drv_15.so	\
+install out/linux.%{outdir}/release/bin/additions/vboxvideo_drv_16.so	\
 	$RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
 
 install out/linux.%{outdir}/release/bin/VBox.png $RPM_BUILD_ROOT%{_pixmapsdir}/VBox.png
@@ -557,6 +551,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.193  2009/04/20 16:50:30  arekm
+- fix build on x86_64; use newer xorg drivers
+
 Revision 1.192  2009/04/15 07:33:46  lmasko
 - Up to 2.2.0. Builds and works on Th with kernel 2.6.27.17.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/VirtualBox.spec?r1=1.192&r2=1.193&f=u