SPECS: VirtualBox.spec - fixed x86_64 build, package 64bit guest drivers - ...

[hawk]

Author: hawk                         Date: Sat Dec 20 11:40:33 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed x86_64 build, package 64bit guest drivers
- works for me, release 1

---- Files affected:
SPECS:
   VirtualBox.spec (1.168 -> 1.169) 

---- Diffs:

================================================================
Index: SPECS/VirtualBox.spec
diff -u SPECS/VirtualBox.spec:1.168 SPECS/VirtualBox.spec:1.169
--- SPECS/VirtualBox.spec:1.168	Fri Dec 19 15:35:46 2008
+++ SPECS/VirtualBox.spec	Sat Dec 20 12:40:27 2008
@@ -24,7 +24,7 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel		0.3
+%define		rel		1
 %define		pname	VirtualBox
 Summary:	VirtualBox OSE - x86 hardware virtualizer
 Summary(pl.UTF-8):	VirtualBox OSE - wirtualizator sprzętu x86
@@ -361,11 +361,6 @@
 	ln -s %{_libdir}/VirtualBox/VirtualBox-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/$f
 done
 
-%ifarch %{x8664}
-install out/linux.%{outdir}/release/bin/VBox*.rel \
-        $RPM_BUILD_ROOT%{_libdir}/VirtualBox
-%endif
-
 install out/linux.%{outdir}/release/bin/VBox*.so \
 	$RPM_BUILD_ROOT%{_libdir}/VirtualBox
 install out/linux.%{outdir}/release/bin/{VBox{DD,DD2}{GC.gc,R0.r0},VMM{GC.gc,R0.r0}} \
@@ -381,13 +376,11 @@
 install out/linux.%{outdir}/release/bin/additions/mountvboxsf		\
 	$RPM_BUILD_ROOT%{_bindir}
 
-%ifnarch %{x8664}
 install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,input}
 install out/linux.%{outdir}/release/bin/additions/vboxmouse_drv_15.so	\
 	$RPM_BUILD_ROOT%{_libdir}/xorg/modules/input/vboxmouse_drv.so
 install out/linux.%{outdir}/release/bin/additions/vboxvideo_drv_15.so	\
 	$RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
-%endif
 
 install out/linux.%{outdir}/release/bin/VBox.png $RPM_BUILD_ROOT%{_pixmapsdir}/VBox.png
 install %{SOURCE7} $RPM_BUILD_ROOT%{_desktopdir}/%{pname}.desktop
@@ -507,9 +500,6 @@
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxTunctl
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxXPCOMIPCD
 %attr(755,root,root) %{_libdir}/VirtualBox/VBox*.so
-%ifarch %{x8664}
-%attr(755,root,root) %{_libdir}/VirtualBox/VBox*.rel
-%endif
 %attr(755,root,root) %{_libdir}/VirtualBox/VirtualBox
 %attr(755,root,root) %{_libdir}/VirtualBox/VirtualBox-wrapper.sh
 %{_libdir}/VirtualBox/*.gc
@@ -548,8 +538,6 @@
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/virtualbox.rules
 
-# 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
@@ -558,7 +546,6 @@
 %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
@@ -588,6 +575,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.169  2008/12/20 11:40:27  hawk
+- fixed x86_64 build, package 64bit guest drivers
+- works for me, release 1
+
 Revision 1.168  2008/12/19 14:35:46  hawk
 - added init script for vboxnetflt kernel module, users are not allowed to
   load it, package init script for vboxfs too
================================================================

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