* VirtualBox: updated to 4.1.4

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@4864 ec354946-7b23-47d6-9f5a-488ba84defc7

V/VirtualBox/VirtualBox-vl.spec

@@ -1,4 +1,4 @@
-%define version	4.1.2
+%define version	4.1.4
 %define release	1%{?_dist_release}
 
 %define kname	vboxdrv
@@ -136,9 +136,10 @@ Group:		System Environment/Kernel
 Requires:	dkms-vboxadd = %{version}-%{release}
 Requires:	dkms-vboxvfs = %{version}-%{release}
 Requires:	dkms-vboxvideo = %{version}-%{release}
-Requires:	xorg-x11-drv-vboxmouse
+#Requires:	xorg-x11-drv-vboxmouse
 Requires:	xorg-x11-drv-vboxvideo
 Requires:	xorg-x11-server-utils
+Obsoletes:	xorg-x11-drv-vboxmouse < 4.1.4
 
 %description    guest-additions
 This packages contains additions for VirtualBox OSE guest systems.
@@ -170,6 +171,7 @@ Kernel module for VirtualBox OSE additions.
 %description -l ja -n dkms-vboxadd
 VirtualBox OSE 追加モジュールのためのカーネルモジュールです。
 
+%if 0
 %package -n	xorg-x11-drv-vboxmouse
 Summary:	X.org X11 input driver for VirtualBox mouse
 Summary:	X.org X11 VirtualBox マウス入力ドライバ
@@ -181,6 +183,7 @@ The X.org driver for mouse in VirtualBox guests
 
 %description -l ja -n xorg-x11-drv-vboxmouse
 VirtualBox のゲストシステム用の X.org マウスドライバです。
+%endif
 
 %package -n	xorg-x11-drv-vboxvideo
 Summary:	X.org X11 video driver for VirtualBox guests
@@ -325,13 +328,17 @@ EOF
 mkdir -p %{buildroot}%{_datadir}/hal/fdi/policy/20thirdparty
 install -m755 %SOURCE3 %{buildroot}%{_initrddir}/vboxadd-timesync
 
-%if %{_dist_release} < vl6
-install -m644 src/VBox/Additions/linux/installer/90-vboxguest.fdi %{buildroot}%{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi
-%endif
-install -d %{buildroot}%{_sysconfdir}/udev/rules.d/
-install -m644 src/VBox/Additions/linux/installer/70-xorg-vboxmouse.rules %{buildroot}%{_sysconfdir}/udev/rules.d/
-install -d %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/
-install -m644 src/VBox/Additions/x11/Installer/50-vboxmouse.conf %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/
+## use the kernel mouse driver for all setups
+## where we previously autoloaded vboxmouse.
+## see the changelog: https://www.virtualbox.org/changeset/38784
+##
+#%if %{_dist_release} < vl6
+#install -m644 src/VBox/Additions/linux/installer/90-vboxguest.fdi %{buildroot}%{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi
+#%endif
+#install -d %{buildroot}%{_sysconfdir}/udev/rules.d/
+#install -m644 src/VBox/Additions/linux/installer/70-xorg-vboxmouse.rules %{buildroot}%{_sysconfdir}/udev/rules.d/
+#install -d %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/
+#install -m644 src/VBox/Additions/x11/Installer/50-vboxmouse.conf %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/
 
 install -d %{buildroot}%{_sysconfdir}/X11/xinit.d
 install -m755 src/VBox/Additions/x11/Installer/98vboxadd-xclient %{buildroot}%{_sysconfdir}/X11/xinit.d
@@ -356,7 +363,7 @@ vboxadd
 EOF
 
   install -d %{buildroot}%{_libdir}/xorg/modules/{input,drivers}
-  install vboxmouse_drv_%{xserverabi}.so %{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so
+  #install vboxmouse_drv_%{xserverabi}.so %{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so
   install vboxvideo_drv_%{xserverabi}.so %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
 
   mkdir -p %{buildroot}%{_usr}/src/vboxadditions-%{version}-%{release}
@@ -528,14 +535,14 @@ set -x
 %{_sysconfdir}/X11/xinit.d/98vboxadd-xclient
 %{_sysconfdir}/modprobe.preload.d/vbox-guest-additions
 
-%files -n xorg-x11-drv-vboxmouse
-%defattr(-,root,root)
-%{_libdir}/xorg/modules/input/vboxmouse_drv.so
-%{_sysconfdir}/X11/xorg.conf.d/*.conf
-%{_sysconfdir}/udev/rules.d/*.rules
-%if %{_dist_release} < vl6
-%{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi
-%endif
+#%files -n xorg-x11-drv-vboxmouse
+#%defattr(-,root,root)
+#%{_libdir}/xorg/modules/input/vboxmouse_drv.so
+#%{_sysconfdir}/X11/xorg.conf.d/*.conf
+#%{_sysconfdir}/udev/rules.d/*.rules
+#%if %{_dist_release} < vl6
+#%{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi
+#%endif
 
 %files -n xorg-x11-drv-vboxvideo
 %defattr(-,root,root)
@@ -551,6 +558,11 @@ set -x
 
 
 %changelog
+* Tue Oct  4 2011 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 4.1.4-1
+- new upstream release
+- use the kernel mouse driver for all setups where we previously
+  autoloaded vboxmouse (see: https://www.virtualbox.org/changeset/38784)
+
 * Wed Aug 24 2011 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 4.1.2-1
 - new upstream release
 - drop Patch50; fix Patch12 & Patch101