Author: glen Date: Thu May 27 18:52:07 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- use xorg 18 drivers; video works with xserver 1.8, so rel 1
---- Files affected:
packages/VirtualBox:
VirtualBox.spec (1.276 -> 1.277)
---- Diffs:
================================================================
Index: packages/VirtualBox/VirtualBox.spec
diff -u packages/VirtualBox/VirtualBox.spec:1.276
packages/VirtualBox/VirtualBox.spec:1.277
--- packages/VirtualBox/VirtualBox.spec:1.276 Thu May 27 20:40:35 2010
+++ packages/VirtualBox/VirtualBox.spec Thu May 27 20:52:01 2010
@@ -28,7 +28,7 @@
%define _enable_debug_packages 0
%endif
-%define rel 0.1
+%define rel 1
%define pname VirtualBox
Summary: VirtualBox OSE - x86 hardware virtualizer
Summary(pl.UTF-8): VirtualBox OSE - wirtualizator sprzętu x86
@@ -56,7 +56,7 @@
Patch3: %{pname}-VBoxSysInfo.patch
Patch4: %{pname}-gcc.patch
URL: http://www.virtualbox.org/
-BuildRequires: rpmbuild(macros) >= 1.531
+BuildRequires: rpmbuild(macros) >= 1.535
%if %{with userspace}
%ifarch %{x8664}
BuildRequires: gcc-multilib
@@ -307,7 +307,9 @@
Requires: dev >= 2.9.0-7
%if %{with dist_kernel}
%requires_releq_kernel
+%if "%{rpm_build_macros}" >= "1.531"
%requires_releq_kernel -n drm
+%endif
Requires(postun): %releq_kernel
%endif
Provides: kernel(vboxvideo) = %{version}-%{rel}
@@ -324,7 +326,7 @@
Release: %{rel}
Group: X11/Applications
Requires: xorg-xserver-server >= 1.0.99.901
-Requires: xorg-xserver-server(xinput-abi) <= 7.0
+Requires: xorg-xserver-server(xinput-abi) <= 9.0
Requires: xorg-xserver-server(xinput-abi) >= 4.0
%description -n xorg-driver-input-vboxmouse
@@ -340,7 +342,7 @@
Group: X11/Applications
Requires: xorg-xserver-libdri >= 1.7.4
Requires: xorg-xserver-server >= 1.0.99.901
-Requires: xorg-xserver-server(videodrv-abi) <= 6.0
+Requires: xorg-xserver-server(videodrv-abi) <= 7.0
Requires: xorg-xserver-server(videodrv-abi) >= 2.0
%description -n xorg-driver-video-vboxvideo
@@ -426,12 +428,12 @@
mv $RPM_BUILD_ROOT{%{_libdir}/%{pname},%{_pixmapsdir}}/VBox.png
mv $RPM_BUILD_ROOT{%{_libdir}/%{pname},%{_desktopdir}}/virtualbox.desktop
-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}
+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}
mv
$RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/VBoxOGL.so,%{_libdir}/xorg/modules/dri/vboxvideo_dri.so}
# xorg other driver versions
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/vboxmouse_drv*.{o,so}
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/vboxvideo_drv*.{o,so}
+rm -vf $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/vboxmouse_drv*.{o,so}
+rm -vf $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/vboxvideo_drv*.{o,so}
# XXX: where else to install them that vboxvideo_dri.so finds them? patch with
rpath?
mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLcrutil.so
@@ -755,6 +757,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.277 2010/05/27 18:52:01 glen
+- use xorg 18 drivers; video works with xserver 1.8, so rel 1
+
Revision 1.276 2010/05/27 18:40:35 pluto
- s/vboxvfs/vboxsf/
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/VirtualBox/VirtualBox.spec?r1=1.276&r2=1.277&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
