Accepting request 114923 from home:mseben:branches:Virtualization

- drop vbox-config.diff and use LocalConfig.kmk to properly define
  lib,app and doc paths (bnc#737525)

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

vbox-config.diff

@@ -1,29 +0,0 @@
---- 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)

virtualbox-LocalConfig.kmk

@@ -0,0 +1,11 @@
+VBOX_WITH_TESTCASES =
+VBOX_WITH_TESTSUITE =
+VBOX_WITH_ORIGIN :=
+BOX_WITH_REGISTRATION_REQUEST =
+VBOX_WITH_UPDATE_REQUEST =
+VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox
+VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
+VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH)
+VBOX_PATH_APP_PRIVATE = /usr/share/virtualbox
+VBOX_PATH_APP_DOCS := /usr/share/doc/packages/virtualbox
+VBOX_WITH_REGISTRATION_REQUEST =

virtualbox.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Apr 21 10:25:41 UTC 2012 - mseben@gmail.com
+
+- drop vbox-config.diff and use LocalConfig.kmk to properly define 
+  lib,app and doc paths (bnc#737525)
+
 -------------------------------------------------------------------
 Wed Apr  4 09:21:39 UTC 2012 - mseben@gmail.com
 

virtualbox.spec

@@ -98,8 +98,7 @@ Source6:        %{name}-guest-kmp-files
 Source7:        %{name}-host-preamble
 Source8:        %{name}-guest-preamble
 Source9:        %{name}-wrapper.sh
-# since 11.3 we need this conf instead of HAL's fdi to define vbox mouse
+Source10:       %{name}-LocalConfig.kmk
-#Source10:       %{name}-60-vboxmouse.conf
 # init script to start virtual boxes during boot, to be configured via /etc/sysconfig/vbox bnc#582398
 Source12:       %{name}-vboxes
 Source13:       %{name}-sysconfig.vbox
@@ -111,8 +110,6 @@ Patch2:         vbox-vboxadd-init-script.diff
 Patch3:         vbox-vboxweb-init-script.diff
 #fix return values which trigger post build checks and coused build error - should goes to upstream
 Patch4:         vbox-ret-in-nonvoid-fnc.diff
-#fix/enable config (rpath, docs, VNC)
-Patch5:         vbox-config.diff
 #fix build : "Error 4001 - String must be entirely alphanumeric"
 #with renaming we probably break some macosx functionality however ths is just quick fix
 #file :http://www.virtualbox.org/browser/trunk/src/VBox/Devices/PC/vbox.ds
@@ -245,7 +242,6 @@ Development file for %{name}
 %patch2
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 %patch6 -p1
 %patch8 -p1
 %patch99 -p1
@@ -255,6 +251,8 @@ Development file for %{name}
 %patch104 -p1
 #copy user manual
 %__cp %{S:1} ./UserManual.pdf
+#copy kbuild config
+%__cp %{S:10} LocalConfig.kmk
 
 %build
 #ensure we dont ever use them
@@ -263,6 +261,8 @@ rm -rf src/libs/{libpng-*,libxml2-*,libxslt-*,zlib-*,boost-*}
 #	--disable-kmods		don't build Linux kernel modules -  but use SUSE specific way see few lines under
 #	--nofatal		try to avoid build fail caused by missing makeself package
 ./configure \
+	--enable-vnc \
+	--enable-vde \
 	--disable-kmods \
 	--disable-java \
 	--disable-docs \