SPECS (AC-branch): VirtualBox.spec - fix X11 drivers install location

[glen]

Author: glen                         Date: Fri Feb 29 18:19:20 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- fix X11 drivers install location

---- Files affected:
SPECS:
   VirtualBox.spec (1.44.2.9 -> 1.44.2.10) 

---- Diffs:

================================================================
Index: SPECS/VirtualBox.spec
diff -u SPECS/VirtualBox.spec:1.44.2.9 SPECS/VirtualBox.spec:1.44.2.10
--- SPECS/VirtualBox.spec:1.44.2.9	Fri Feb 29 19:05:15 2008
+++ SPECS/VirtualBox.spec	Fri Feb 29 19:19:15 2008
@@ -310,9 +310,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%{_prefix}/X11R6/modules/drivers \
-	$RPM_BUILD_ROOT%{_prefix}/X11R6/modules/input
+	$RPM_BUILD_ROOT/etc/rc.d/init.d
 
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/virtualbox
 
@@ -342,11 +340,13 @@
 install out/linux.%{outdir}/release/bin/additions/mountvboxsf		\
 	$RPM_BUILD_ROOT%{_bindir}
 
+%ifnarch %{x8664}
+install -d $RPM_BUILD_ROOT%{_x_libraries}/modules/{drivers,input}
 install out/linux.%{outdir}/release/bin/additions/vboxmouse_drv_70.so	\
-	$RPM_BUILD_ROOT%{_prefix}/X11R6/modules/input/vboxmouse_drv.so
-
+	$RPM_BUILD_ROOT%{_x_libraries}/modules/input/vboxmouse_drv.so
 install out/linux.%{outdir}/release/bin/additions/vboxvideo_drv_70.so	\
-	$RPM_BUILD_ROOT%{_prefix}/X11R6/modules/drivers/vboxvideo_drv.so
+	$RPM_BUILD_ROOT%{_x_libraries}/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
@@ -472,11 +472,11 @@
 %ifnarch %{x8664}
 %files -n X11-driver-input-vboxmouse
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_prefix}/X11R6/modules/input/vboxmouse_drv.so
+%attr(755,root,root) %{_x_libraries}/modules/input/vboxmouse_drv.so
 
 %files -n X11-driver-video-vboxvideo
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_prefix}/X11R6/modules/drivers/vboxvideo_drv.so
+%attr(755,root,root) %{_x_libraries}/modules/drivers/vboxvideo_drv.so
 %endif
 %endif
 
@@ -517,6 +517,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.44.2.10  2008-02-29 18:19:15  glen
+- fix X11 drivers install location
+
 Revision 1.44.2.9  2008-02-29 18:05:15  glen
 - current ac kernel stuff
 
================================================================

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