SPECS: VirtualBox.spec - AC-branch merge

[glen]

Author: glen                         Date: Fri Feb 29 19:12:44 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- AC-branch merge

---- Files affected:
SPECS:
   VirtualBox.spec (1.67 -> 1.68) 

---- Diffs:

================================================================
Index: SPECS/VirtualBox.spec
diff -u SPECS/VirtualBox.spec:1.67 SPECS/VirtualBox.spec:1.68
--- SPECS/VirtualBox.spec:1.67	Fri Feb 29 19:10:22 2008
+++ SPECS/VirtualBox.spec	Fri Feb 29 20:12:39 2008
@@ -287,9 +287,7 @@
 install -d \
 	$RPM_BUILD_ROOT{%{_bindir},%{_pixmapsdir},%{_desktopdir}} \
 	$RPM_BUILD_ROOT%{_libdir}/VirtualBox \
-	$RPM_BUILD_ROOT/etc/rc.d/init.d \
-	$RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers \
-	$RPM_BUILD_ROOT%{_libdir}/xorg/modules/input
+	$RPM_BUILD_ROOT/etc/rc.d/init.d
 
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/virtualbox
 
@@ -319,11 +317,13 @@
 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_14.so	\
 	$RPM_BUILD_ROOT%{_libdir}/xorg/modules/input/vboxmouse_drv.so
-
 install out/linux.%{outdir}/release/bin/additions/vboxvideo_drv_14.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 %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir}/%{pname}.desktop
@@ -471,6 +471,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.68  2008-02-29 19:12:39  glen
+- AC-branch merge
+
 Revision 1.67  2008-02-29 18:10:22  glen
 - AC-branch merges
 
================================================================

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