From 016099dd6aec275c11f12459733de1243c0e7b740ff55a739d810bfb5a007c81 Mon Sep 17 00:00:00 2001
From: Michal Seben <mseben@gmail.com>
Date: Fri, 16 Sep 2011 07:35:36 +0000
Subject: [PATCH] Accepting request 82285 from
 home:mseben:branches: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/82285
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=55
---
 virtualbox-60-vboxdrv.rules |  2 +-
 virtualbox.changes          |  7 +++++++
 virtualbox.spec             | 10 +++++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/virtualbox-60-vboxdrv.rules b/virtualbox-60-vboxdrv.rules
index add34ee..a23e6fa 100644
--- a/virtualbox-60-vboxdrv.rules
+++ b/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"
 
diff --git a/virtualbox.changes b/virtualbox.changes
index 7dadbf9..709ac1a 100644
--- a/virtualbox.changes
+++ b/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
 
diff --git a/virtualbox.spec b/virtualbox.spec
index 4976fea..1e917da 100644
--- a/virtualbox.spec
+++ b/virtualbox.spec
@@ -227,6 +227,7 @@ Development file for %{name}
 %patch100 
 %patch101
 %patch102 
+#%patch103 -p1
 #copy user manual
 %__cp %{S:1} ./UserManual.pdf
 
@@ -355,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 \
@@ -380,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 \