Accepting request 82338 from Virtualization

included proper versions of vboxmouse_drv and vboxvideo_drv (xorg drivers) in to virtualbox-guest-x11
fixed typo in virtualbox-60-vboxdrv.rules

OBS-URL: https://build.opensuse.org/request/show/82338
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=38

virtualbox-60-vboxdrv.rules

@@ -1,5 +1,5 @@
 KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600"
 #these two lines give access permission to vboxusers to properly work with usb nodes, this could be security risk (bnc#664520) !!
 #SUBSYSTEM=="usb_device", ATTR{devnum}=="?*", ATTR{busnum}=="?*",SYMLINK+="vboxusb/$attr{busnum}/$attr{devnum}", GROUP="vboxusers"
-#SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{devnum}=="?*", ATTR{busnum}=="?*",SYMLINK="vboxusb/$attr{busnum}/$attr{devnum}", GROUP="vboxusers"
+#SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{devnum}=="?*", ATTR{busnum}=="?*",SYMLINK+="vboxusb/$attr{busnum}/$attr{devnum}", GROUP="vboxusers"
 

virtualbox.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Sep 15 10:17:05 UTC 2011 - mseben@gmail.com
+
+- included proper versions of vboxmouse_drv and vboxvideo_drv (xorg drivers) in to 
+  virtualbox-guest-x11
+- fixed typo in virtualbox-60-vboxdrv.rules
+
 -------------------------------------------------------------------
 Mon Aug 22 11:29:11 UTC 2011 - mseben@gmail.com
 

virtualbox.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package virtualbox
+# spec file for package virtualbox (Version 3.9.80)
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -37,7 +37,7 @@ BuildRequires:  bin86 dev86 libidl-devel libqt4-devel libxslt-devel yasm
 BuildRequires:  SDL-devel kernel-syms module-init-tools
 BuildRequires:  e2fsprogs-devel libcap-devel libcurl-devel python-devel update-desktop-files
 BuildRequires:  pulseaudio-devel xorg-x11 xorg-x11-devel xorg-x11-server xorg-x11-server-sdk
-BuildRequires:  LibVNCServer-devel gcc gcc-c++ kbuild pam-devel quilt udev
+BuildRequires:  LibVNCServer-devel gcc gcc-c++ kbuild pam-devel udev quilt
 BuildRequires:  boost-devel
 %if %suse_version > 1110
 BuildRequires:  zlib-devel-static
@@ -49,7 +49,7 @@ BuildRequires:  hal-32bit
 %endif	
 BuildRequires:  xorg-x11-libX11-devel-32bit xorg-x11-libXt-devel-32bit xorg-x11-libs-32bit
 BuildRequires:  xorg-x11-libXext-devel-32bit xorg-x11-libXmu-devel-32bit
-BuildRequires:  gcc-32bit gcc-c++-32bit
+BuildRequires:  gcc-32bit  gcc-c++-32bit
 %endif
 #
 ExclusiveArch:  %ix86 x86_64
@@ -190,7 +190,6 @@ VirtualBox guest addition tools.
 ###########################################
 %package -n python-%{name}
 
-
 Summary:        Python bindings for %{name}
 Group:          Development/Libraries/Python
 Requires:       %{name} = %{version}
@@ -228,6 +227,7 @@ Development file for %{name}
 %patch100 
 %patch101
 %patch102 
+#%patch103 -p1
 #copy user manual
 %__cp %{S:1} ./UserManual.pdf
 
@@ -356,7 +356,13 @@ pushd out/linux.*/release/bin/additions/
 #VBoxClient daemon (support for clipboard,autoresize,seamless windows)
 %__install -m 755 VBoxClient	%{buildroot}%{_bindir}
 # xorg drivers for mouse and videos check suse version to add propper driver
-%if %suse_version > 1130
+%if %suse_version > 1140
+	%__install -m 755 vboxmouse_drv_110.so \
+				%{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so
+	%__install -m 755 vboxvideo_drv_110.so \
+				%{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
+%else
+%if %suse_version == 1140
 	%__install -m 755 vboxmouse_drv_19.so \
 				%{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so
 	%__install -m 755 vboxvideo_drv_19.so \
@@ -381,6 +387,7 @@ pushd out/linux.*/release/bin/additions/
 %endif
 %endif
 %endif
+%endif
 popd
 # VBoxOGL* libs for guest-x11 subpackage
 %__install -m 644 out/linux.*/release/bin/additions/VBoxOGL*.so \
@@ -452,6 +459,7 @@ popd
 #install wrapper script
 %__install -m 644 %{S:9} 		%{buildroot}%{_bindir}/VirtualBox
 
+
 # modify and install the vboxdrv init script
 # TODO: some of this stuff breaks the fillup macros below?
 %__sed -i "s|%NOLSB%|yes|g;s|%DEBIAN%||g;s|%PACKAGE%|virtualbox|g" src/VBox/Installer/linux/vboxdrv.sh.in
@@ -466,6 +474,8 @@ popd
 %__install -d -m 755 			%{buildroot}%{_var}/adm/fillup-templates
 install -m 700 %{S:13} 			%{buildroot}%{_var}/adm/fillup-templates/sysconfig.vbox
 
+
+
 ######################################################
 echo "entrering python-virtualbox install section"
 ######################################################
@@ -625,7 +635,6 @@ exit 0
 %verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxHeadless
 %verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxSDL
 #
-
 %files qt
 %defattr(-, root, root)
 %{_vbox_instdir}/VBoxPermissionMessage
@@ -640,7 +649,6 @@ exit 0
 %{_datadir}/pixmaps/virtualbox.png
 %{_datadir}/applications/%{name}.desktop
 #
-
 %files guest-x11
 %defattr(-, root, root)
 %dir %{_libdir}/xorg/modules/drivers
@@ -658,7 +666,6 @@ exit 0
 %{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi
 %endif
 #
-
 %files guest-tools
 %defattr(-, root, root)
 %{_bindir}/VBoxControl
@@ -668,7 +675,6 @@ exit 0
 %config %{_sysconfdir}/init.d/vboxadd
 %{_sbindir}/rcvboxadd
 #
-
 %files -n python-%{name} -f %{_tmppath}/SITE_FILES
 %defattr(-, root, root)
 %dir %{_vbox_instdir}/sdk