packages: VirtualBox/VirtualBox.spec - Titanium uses xorg 1.7

[hawk]

Author: hawk                         Date: Wed Jun  2 21:23:34 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Titanium uses xorg 1.7

---- Files affected:
packages/VirtualBox:
   VirtualBox.spec (1.278 -> 1.279) 

---- Diffs:

================================================================
Index: packages/VirtualBox/VirtualBox.spec
diff -u packages/VirtualBox/VirtualBox.spec:1.278 packages/VirtualBox/VirtualBox.spec:1.279
--- packages/VirtualBox/VirtualBox.spec:1.278	Fri May 28 19:57:39 2010
+++ packages/VirtualBox/VirtualBox.spec	Wed Jun  2 23:23:29 2010
@@ -326,7 +326,11 @@
 Release:	%{rel}
 Group:		X11/Applications
 Requires:	xorg-xserver-server >= 1.0.99.901
+%if "%{pld_release}" == "ti"
+Requires:	xorg-xserver-server(xinput-abi) <= 7.0
+%else
 Requires:	xorg-xserver-server(xinput-abi) <= 9.0
+%endif
 Requires:	xorg-xserver-server(xinput-abi) >= 4.0
 
 %description -n xorg-driver-input-vboxmouse
@@ -342,7 +346,11 @@
 Group:		X11/Applications
 Requires:	xorg-xserver-libdri >= 1.7.4
 Requires:	xorg-xserver-server >= 1.0.99.901
+%if "%{pld_release}" == "ti"
+Requires:	xorg-xserver-server(videodrv-abi) <= 6.0
+%else
 Requires:	xorg-xserver-server(videodrv-abi) <= 7.0
+%endif
 Requires:	xorg-xserver-server(videodrv-abi) >= 2.0
 
 %description -n xorg-driver-video-vboxvideo
@@ -428,8 +436,13 @@
 mv $RPM_BUILD_ROOT{%{_libdir}/%{pname},%{_pixmapsdir}}/VBox.png
 mv $RPM_BUILD_ROOT{%{_libdir}/%{pname},%{_desktopdir}}/virtualbox.desktop
 
+%if "%{pld_release}" == "ti"
+mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/vboxmouse_drv_17.so,%{_libdir}/xorg/modules/input/vboxmouse_drv.so}
+mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/vboxvideo_drv_17.so,%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so}
+%else
 mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/vboxmouse_drv_18.so,%{_libdir}/xorg/modules/input/vboxmouse_drv.so}
 mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/vboxvideo_drv_18.so,%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so}
+%endif
 mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/VBoxOGL.so,%{_libdir}/xorg/modules/dri/vboxvideo_dri.so}
 # xorg other driver versions
 rm -vf $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/vboxmouse_drv*.{o,so}
@@ -757,6 +770,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.279  2010/06/02 21:23:29  hawk
+- Titanium uses xorg 1.7
+
 Revision 1.278  2010/05/28 17:57:39  arekm
 - release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/VirtualBox/VirtualBox.spec?r1=1.278&r2=1.279&f=u