VirtualBox: update to 3.2.0

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

V/VirtualBox/VirtualBox-vl.spec

@@ -1,5 +1,5 @@
-%define version	3.1.6
-%define release	2%{?_dist_release}
+%define version	3.2.0
+%define release	1%{?_dist_release}
 
 %define kname	vboxdrv
 %define oname	VirtualBox
@@ -42,14 +42,10 @@ Patch4:		VirtualBox-1.6.0_OSE-futex.patch
 Patch5:         virtualbox-fix-vboxadd-req.patch
 # (fc) 1.6.0-2mdv fix initscript name in VBox.sh script
 Patch6:		VirtualBox-1.6.0_OSE-initscriptname.patch
-# (fc) 2.0.2-2mdv disable version check at startup
-Patch8:		VirtualBox-disableversioncheck.patch
 # (hk) fix build kernel-headers-2.6.29*
 Patch10:	VirtualBox-kernel-headers-2.6.29.patch
-# (fc) 2.2.0-1mdv add Wine Direct3D guest additions option (Debian)
-Patch11:	15-wined3d-guest-addition.patch
 # (fc) 2.2.0-1mdv disable update notification (Debian)
-Patch12:	16-no-update.patch
+Patch12:        16-no-update.patch
 
 # vine
 Patch100:	VirtualBox-2.2.2-buildfix.patch
@@ -139,6 +135,8 @@ Requires(post):	  dkms
 Requires(preun):  dkms
 Provides:	dkms-vboxvfs = %{version}-%{release}
 Obsoletes:	dkms-vboxvfs < %{version}-%{release}
+Provides:       dkms-vboxsf = %{version}-%{release}
+Obsoletes:      dkms-vboxsf < %{version}-%{release}
 Provides:	dkms-vboxvideo = %{version}-%{release}
 Obsoletes:	dkms-vboxvideo < %{version}-%{release}
 
@@ -180,9 +178,7 @@ VirtualBox のゲストシステム用の X.org ビデオドライバです。
 %patch4 -p1 -b .futex
 %patch5 -p1 -b .fix-timesync-req
 %patch6 -p1 -b .initscriptname
-%patch8 -p1 -b .versioncheck
 %patch10 -p1 -b .kernel-headers-2.6.29
-%patch11 -p1 -b .wined3d
 %patch12 -p1 -b .disable-update
 %patch100 -p1 -b .buildfix
 
@@ -194,7 +190,7 @@ VBOX_PATH_APP_PRIVATE_ARCH:=%{vboxlibdir}
 VBOX_WITH_ORIGIN:=
 VBOX_WITH_RUNPATH:=%{vboxlibdir}
 VBOX_PATH_APP_PRIVATE:=%{vboxdatadir}
-VBOX_WITH_TESTCASE:=
+VBOX_WITH_TESTCASES:=
 VBOX_WITH_TESTSUITE:=
 EOF
 
@@ -290,8 +286,12 @@ EOF
 %if %{build_additions}
 mkdir -p %{buildroot}%{_datadir}/hal/fdi/policy/20thirdparty
 install -m755 src/VBox/Additions/linux/installer/vboxadd-service.sh %{buildroot}%{_initrddir}/vboxadd-timesync
-install -m755 src/VBox/Additions/x11/Installer/VBoxRandR.sh %{buildroot}%{_bindir}/VBoxRandR
+#install -m755 src/VBox/Additions/x11/Installer/VBoxRandR.sh %{buildroot}%{_bindir}/VBoxRandR
 install -m755 src/VBox/Additions/linux/installer/90-vboxguest.fdi %{buildroot}%{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi
+mkdir -p %{buildroot}%{_sysconfdir}/udev/rules.d/
+install -m755 src/VBox/Additions/linux/installer/70-xorg-vboxmouse.rules %{buildroot}%{_sysconfdir}/udev/rules.d/
+mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/
+install -m755 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
@@ -313,7 +313,6 @@ pushd out/%{vbox_platform}/release/bin/additions
   install -d %{buildroot}%{_sysconfdir}/modprobe.preload.d
   cat > %{buildroot}%{_sysconfdir}/modprobe.preload.d/vbox-guest-additions << EOF
 vboxadd
-vboxvfs
 EOF
 
   install -d %{buildroot}%{_libdir}/xorg/modules/{input,drivers}
@@ -325,14 +324,15 @@ EOF
 PACKAGE_NAME=vboxadditions
 PACKAGE_VERSION=%{version}-%{release}
 MAKE[0]="make -C \$kernel_source_dir M=\$dkms_tree/\$module/\$module_version/build/vboxguest &&
-cp \$dkms_tree/\$module/\$module_version/build/vboxguest/Module.symvers \$dkms_tree/\$module/\$module_version/build/vboxvfs &&
-make -C \$kernel_source_dir M=\$dkms_tree/\$module/\$module_version/build/vboxvfs &&
-cp \$dkms_tree/\$module/\$module_version/build/vboxvfs/Module.symvers \$dkms_tree/\$module/\$module_version/build/vboxvideo &&
+cp
+\$dkms_tree/\$module/\$module_version/build/vboxguest/Module.symvers \$dkms_tree/\$module/\$module_version/build/vboxsf &&
+make -C \$kernel_source_dir M=\$dkms_tree/\$module/\$module_version/build/vboxsf &&
+cp \$dkms_tree/\$module/\$module_version/build/vboxsf/Module.symvers \$dkms_tree/\$module/\$module_version/build/vboxvideo &&
 make -C \$kernel_source_dir M=\$dkms_tree/\$module/\$module_version/build/vboxvideo"
 EOF
 
   i=0
-  for kmod in vboxguest vboxvfs vboxvideo; do
+  for kmod in vboxguest vboxsf vboxvideo; do
     mkdir -p %{buildroot}%{_usr}/src/vboxadditions-%{version}-%{release}/$kmod
     cp -a src/$kmod/* %{buildroot}%{_usr}/src/vboxadditions-%{version}-%{release}/$kmod/
     cat >> %{buildroot}%{_usr}/src/vboxadditions-%{version}-%{release}/dkms.conf << EOF
@@ -344,12 +344,12 @@ EOF
   done
   cat >> %{buildroot}%{_usr}/src/vboxadditions-%{version}-%{release}/dkms.conf << EOF
 CLEAN="make -C \$kernel_source_dir M=\$dkms_tree/\$module/\$module_version/build/vboxguest clean && 
-make -C \$kernel_source_dir M=\$dkms_tree/\$module/\$module_version/build/vboxvfs clean && 
+make -C \$kernel_source_dir M=\$dkms_tree/\$module/\$module_version/build/vboxsf clean && 
 make -C \$kernel_source_dir M=\$dkms_tree/\$module/\$module_version/build/vboxvideo clean "
 AUTOINSTALL=yes
 EOF
 popd
-  sed 's/^\(.package.*-kernel-\)\(.*-latest\)\(.*\)\\$/\1\2\3Obsoletes: vboxvfs-kernel-\2 vboxvideo-kernel-\2\\n\\/' /etc/dkms/template-dkms-mkrpm.spec > %{buildroot}%{_usr}/src/vboxadditions-%{version}-%{release}/vboxadditions-dkms-mkrpm.spec
+  sed 's/^\(.package.*-kernel-\)\(.*-latest\)\(.*\)\\$/\1\2\3Obsoletes: vboxsf-kernel-\2 vboxvideo-kernel-\2\\n\\/' /etc/dkms/template-dkms-mkrpm.spec > %{buildroot}%{_usr}/src/vboxadditions-%{version}-%{release}/vboxadditions-dkms-mkrpm.spec
 %endif
 
 # install icons
@@ -483,7 +483,6 @@ set -x
 %{_sbindir}/VBoxService
 %{_bindir}/VBoxClient
 %{_bindir}/VBoxControl
-%{_bindir}/VBoxRandR
 %{_sysconfdir}/security/console.perms.d/60-vboxadd.perms
 %{_sysconfdir}/udev/rules.d/vbox-additions.rules
 %{_sysconfdir}/X11/xinit.d/98vboxadd-xclient
@@ -492,6 +491,8 @@ set -x
 %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
 %{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi
 
 %files -n xorg-x11-drv-vboxvideo
@@ -508,6 +509,13 @@ set -x
 
 
 %changelog
+* Sat May 22 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 3.2.0-1
+- new upstream release
+- drop wined3d patch as the Windows guest additions provide 
+  Direct3D acceleration.
+- add xorg.conf snippet for new xserver
+- vboxvfs renamed to vboxsf
+
 * Mon Apr 19 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 3.1.6-2
 - fix initscript