SPECS: VirtualBox.spec - fixed build on x86_64 - there is problem ...

[kosmo]

Author: kosmo                        Date: Mon Oct  8 14:53:37 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed build on x86_64
- there is problem with kernel modules (but on i686 works)

---- Files affected:
SPECS:
   VirtualBox.spec (1.35 -> 1.36) 

---- Diffs:

================================================================
Index: SPECS/VirtualBox.spec
diff -u SPECS/VirtualBox.spec:1.35 SPECS/VirtualBox.spec:1.36
--- SPECS/VirtualBox.spec:1.35	Wed Oct  3 16:47:58 2007
+++ SPECS/VirtualBox.spec	Mon Oct  8 16:53:32 2007
@@ -35,6 +35,7 @@
 Patch0:		%{name}-configure.patch
 Patch1:		%{name}-qt-paths.patch
 Patch2:		%{name}-shared-libstdc++.patch
+Patch3:		%{name}-disable-xclient-build.patch
 URL:		http://www.virtualbox.org/
 BuildRequires:	SDL-devel
 BuildRequires:	alsa-lib-devel
@@ -56,6 +57,11 @@
 BuildRequires:	xerces-c-devel >= 2.6.0
 BuildRequires:	xorg-lib-libXcursor-devel
 BuildRequires:	zlib-devel >= 1.2.1
+%ifarch %{x8664}
+BuildRequires:	gcc-multilib
+BuildRequires:	libstdc++-multilib-devel
+# TODO: How to add glibc-devel.i686 here ?
+%endif
 Requires(postun):	/usr/sbin/groupdel
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
@@ -201,6 +207,11 @@
 %patch0 -p0
 %patch1 -p0
 %patch2 -p1
+
+%ifarch %{x8664}
+%patch3 -p1
+%endif
+
 install %{SOURCE1} .
 
 %build
@@ -214,11 +225,9 @@
 %endif
 
 %if %{with dist_kernel}
-[ ! -f $KDIR/include/linux/autoconf.h ] && \
-    ln -sf $KDIR/include/linux/autoconf-dist.h $KDIR/include/linux/autoconf.h
+ln -sf $KDIR/include/linux/autoconf-dist.h $KDIR/include/linux/autoconf.h
 %else
-[ ! -f $KDIR/include/linux/autoconf.h ] && \
-    ln -sf $KDIR/include/linux/autoconf-nondist.h $KDIR/include/linux/autoconf.h
+ln -sf $KDIR/include/linux/autoconf-nondist.h $KDIR/include/linux/autoconf.h
 %endif
 
 ./configure \
@@ -237,7 +246,7 @@
 	tar -zxf modules.tar.gz && rm -f modules.tar.gz
 ../src/VBox/Additions/linux/export_modules modules.tar.gz
 	tar -zxf modules.tar.gz && rm -f modules.tar.gz
-
+	
 %build_kernel_modules -m vboxadd -C vboxadd
 %build_kernel_modules -m vboxdrv -C vboxdrv
 %build_kernel_modules -m vboxvfs -C vboxvfs
@@ -372,6 +381,8 @@
 %{_pixmapsdir}/VBox.png
 %{_desktopdir}/%{name}.desktop
 
+# Drivers are for Guest OS, which is 32-bit.
+%ifnarch %{x8664}
 %files -n xorg-driver-input-vboxmouse
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xorg/modules/input/vboxmouse_drv.so
@@ -380,6 +391,7 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
 %endif
+%endif
 
 %if %{with kernel}
 %files -n kernel%{_alt_kernel}-misc-vboxadd
@@ -401,6 +413,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2007/10/08 14:53:32  kosmo
+- fixed build on x86_64
+- there is problem with kernel modules (but on i686 works)
+
 Revision 1.35  2007/10/03 14:47:58  kosmo
 - added missing br
 
================================================================

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