Accepting request 59837 from Virtualization:VirtualBox_backports

- Minor packaging fixes -  * ExtPack: add missing host helper util (VBoxExtPackHelper) -  * Config.kmk: patch for VNC (removed from spec), documentation path (fixes GUI), combine with existing rpath diff -  * spec: migrate VNC echo to patch, fix desktop file overwrite issue / bug

OBS-URL: https://build.opensuse.org/request/show/59837
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=27

vbox-config.diff

@@ -0,0 +1,29 @@
+--- VirtualBox-4.0.2_OSE.orig/Config.kmk	2011-01-18 16:33:45.000000000 +0000
++++ VirtualBox-4.0.2_OSE/Config.kmk	2011-01-31 01:27:30.788003407 +0000
+@@ -503,7 +503,7 @@
+  VBOX_WITH_CROGL = 1
+ endif
+ # Enable the VNC server in VBoxHeadless (GPL only).
+-#VBOX_WITH_VNC = 1
++VBOX_WITH_VNC = 1
+ # Enable S3 support (requires libcurl)
+ VBOX_WITH_S3 = 1
+ ## @}
+@@ -581,7 +581,7 @@
+ #VBOX_PATH_APP_PRIVATE       = /usr/lib/virtualbox
+ ifdef VBOX_WITH_HARDENING
+  if1of ($(KBUILD_TARGET), linux solaris)
+-  VBOX_PATH_APP_PRIVATE      = /opt/VirtualBox
++  VBOX_PATH_APP_PRIVATE      = /usr/lib/virtualbox
+  else ifeq ($(KBUILD_TARGET),darwin)
+   VBOX_PATH_APP_PRIVATE      = /Applications/VirtualBox.app/Contents/MacOS
+  else ifeq ($(KBUILD_TARGET),freebsd)
+@@ -608,7 +608,7 @@
+  endif
+ endif
+ # Where the documentation is (going to be) installed.
+-#VBOX_PATH_APP_DOCS         = /usr/share/doc/virtualbox
++VBOX_PATH_APP_DOCS         = /usr/share/doc/packages/virtualbox
+ ifdef VBOX_WITH_HARDENING
+  if1of ($(KBUILD_TARGET), darwin solaris)
+   VBOX_PATH_APP_DOCS         = $(VBOX_PATH_APP_PRIVATE)

vbox-rpath.diff

@@ -1,13 +0,0 @@
-Index: VirtualBox-4.0.0_OSE/Config.kmk
-===================================================================
---- VirtualBox-4.0.0_OSE.orig/Config.kmk
-+++ VirtualBox-4.0.0_OSE/Config.kmk
-@@ -580,7 +580,7 @@ endif
- #VBOX_PATH_APP_PRIVATE       = /usr/lib/virtualbox
- ifdef VBOX_WITH_HARDENING
-  if1of ($(KBUILD_TARGET), linux solaris)
--  VBOX_PATH_APP_PRIVATE      = /opt/VirtualBox
-+  VBOX_PATH_APP_PRIVATE      = /usr/lib/virtualbox
-  else ifeq ($(KBUILD_TARGET),darwin)
-   VBOX_PATH_APP_PRIVATE      = /Applications/VirtualBox.app/Contents/MacOS
-  else ifeq ($(KBUILD_TARGET),freebsd)

virtualbox.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jan 31 01:52:58 UTC 2011 - cshorler@googlemail.com
+
+- Minor packaging fixes
+  * ExtPack: add missing host helper util (VBoxExtPackHelper)
+  * Config.kmk: patch for VNC (removed from spec), documentation path (fixes GUI), combine with existing rpath diff
+  * spec: migrate VNC echo to patch, fix desktop file overwrite issue / bug
+
 -------------------------------------------------------------------
 Thu Jan 27 12:47:31 UTC 2011 - cristian.rodriguez@opensuse.org