Accepting request 70542 from Virtualization

update virtualbox to 4.0.8

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

VirtualBox-4.0.4-UserManual.pdf

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e892289122efc05055d526cad4d057961e64b4a049791fb386cd1cc75fa16bd4
-size 4875629

VirtualBox-4.0.4-patched.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dd938cb401092145bb3540f243ccf3da065ba7d356067ec7d7336f78a3bc9da8
-size 43795894

VirtualBox-4.0.8-UserManual.pdf

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d9721bb6c3827a0fc8196c4f75f972ccc5e62060b6667baf46eb32803120d645
+size 4884443

VirtualBox-4.0.8-patched.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:80b47507b8f60f455ce4dd4b898b3ef04a4eabcdee6794fdc889218f6ad2eb6f
+size 43193793

vbox-no-build-dates.diff

@@ -80,3 +80,96 @@
                    " */\n"
                    "\n"
                    "/*\n"
+--- src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c.orig
++++ src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
+@@ -42,16 +42,13 @@
+ /**************************IDENTITY AND VERSIONING***********************/
+ /************************************************************************/
+ #include "_pl_bld.h"
+-#if !defined(_BUILD_TIME)
+-#ifdef HAVE_LONG_LONG
+-#define _BUILD_TIME 0
+-#else
++
++#undef _BUILD_TIME
+ #define _BUILD_TIME {0, 0}
+-#endif
+-#endif
+-#if !defined(_BUILD_STRING)
++
++#undef _BUILD_STRING
+ #define _BUILD_STRING ""
+-#endif
++
+ #if !defined(_PRODUCTION)
+ #define _PRODUCTION ""
+ #endif
+--- src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c.orig
++++ src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
+@@ -44,16 +44,10 @@
+ #ifndef XP_MAC
+ #include "_pr_bld.h"
+ #endif
+-#if !defined(_BUILD_TIME)
+-#ifdef HAVE_LONG_LONG
+-#define _BUILD_TIME 0
+-#else
++#undef _BUILD_TIME
+ #define _BUILD_TIME {0, 0}
+-#endif
+-#endif
+-#if !defined(_BUILD_STRING)
++#undef  _BUILD_STRING
+ #define _BUILD_STRING ""
+-#endif
+ #if !defined(_PRODUCTION)
+ #define _PRODUCTION ""
+ #endif
+--- src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c.orig
++++ src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
+@@ -42,16 +42,13 @@
+ /**************************IDENTITY AND VERSIONING***********************/
+ /************************************************************************/
+ #include "_pl_bld.h"
+-#if !defined(_BUILD_TIME)
+-#ifdef HAVE_LONG_LONG
+-#define _BUILD_TIME 0
+-#else
++
++#undef _BUILD_TIME
+ #define _BUILD_TIME {0, 0}
+-#endif
+-#endif
+-#if !defined(_BUILD_STRING)
++
++#undef _BUILD_STRING
+ #define _BUILD_STRING ""
+-#endif
++
+ #if !defined(_PRODUCTION)
+ #define _PRODUCTION ""
+ #endif
+--- src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c.orig
++++ src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
+@@ -42,16 +42,13 @@
+ /**************************IDENTITY AND VERSIONING***********************/
+ /************************************************************************/
+ #include "_pl_bld.h"
+-#if !defined(_BUILD_TIME)
+-#ifdef HAVE_LONG_LONG
+-#define _BUILD_TIME 0
+-#else
++
++#undef _BUILD_TIME
+ #define _BUILD_TIME {0, 0}
+-#endif
+-#endif
+-#if !defined(_BUILD_STRING)
++
++#undef _BUILD_STRING
+ #define _BUILD_STRING ""
+-#endif
++
+ #if !defined(_PRODUCTION)
+ #define _PRODUCTION ""
+ #endif

vbox-vboxadd-init-script.diff

@@ -25,9 +25,9 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
 -owner=vboxadd
 -group=1
  
- test_sane_kernel_dir()
+ test_for_gcc_and_make()
  {
-@@ -236,12 +235,6 @@ do_vboxguest_non_udev()
+@@ -242,12 +241,6 @@ do_vboxguest_non_udev()
              fail "Cannot create device $dev with major $maj and minor $min"
          }
      fi
@@ -40,7 +40,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
  
      if [ ! -c $userdev ]; then
          maj=10
-@@ -252,12 +245,6 @@ do_vboxguest_non_udev()
+@@ -258,12 +251,6 @@ do_vboxguest_non_udev()
                  rmmod vboxguest 2>/dev/null
                  fail "Cannot create device $userdev with major $maj and minor $min"
              }
@@ -53,7 +53,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
          fi
      fi
  }
-@@ -286,8 +273,7 @@ start()
+@@ -292,8 +279,7 @@ start()
          do_vboxguest_non_udev;;
      esac
  
@@ -63,7 +63,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
              $MODPROBE vboxsf > /dev/null 2>&1 || {
                  if dmesg | grep "vboxConnect failed" > /dev/null 2>&1; then
                      fail_msg
-@@ -297,8 +283,7 @@ start()
+@@ -303,8 +289,7 @@ start()
                  fi
                  fail "modprobe vboxsf failed"
              }
@@ -73,7 +73,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
  
      # Mount all shared folders from /etc/fstab. Normally this is done by some
      # other startup script but this requires the vboxdrv kernel module loaded.
-@@ -315,10 +300,8 @@ stop()
+@@ -321,10 +306,8 @@ stop()
      if ! umount -a -t vboxsf 2>/dev/null; then
          fail "Cannot unmount vboxsf folders"
      fi
@@ -86,7 +86,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
      fi
      if running_vboxguest; then
          rmmod vboxguest 2>/dev/null || fail "Cannot unload module vboxguest"
-@@ -464,16 +447,8 @@ extra_setup()
+@@ -483,16 +466,8 @@ extra_setup()
  # setup_script
  setup()
  {

vbox-vboxdrv-init-script.diff

@@ -37,7 +37,7 @@ Index: src/VBox/Installer/linux/vboxdrv.sh.in
  
  if [ -n "$NOLSB" ]; then
      if [ -f /etc/redhat-release ]; then
-@@ -189,13 +190,6 @@ start()
+@@ -192,13 +193,6 @@ start()
              failure "Cannot create device $DEVICE with major $MAJOR and minor $MINOR"
          fi
      fi
@@ -51,7 +51,7 @@ Index: src/VBox/Installer/linux/vboxdrv.sh.in
      if ! $MODPROBE vboxnetflt > /dev/null 2>&1; then
          failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why"
      fi
-@@ -279,48 +273,8 @@ stop_vms()
+@@ -288,48 +282,8 @@ stop_vms()
  # setup_script
  setup()
  {
@@ -95,9 +95,10 @@ Index: src/VBox/Installer/linux/vboxdrv.sh.in
 -      fi
 -    fi
 -    rm -f /etc/vbox/module_not_compiled
-+    begin_msg "Recompiling VirtualBox vboxadd kernel module, NOT. It has been packaged."
+-    succ_msg
-     succ_msg
 -    start
++    begin_msg "Recompiling VirtualBox vboxadd kernel module, NOT. It has been packaged."
++	succ_msg
  }
  
  dmnstatus()

vbox-xpcom-kmk.diff

@@ -1,15 +0,0 @@
---- VirtualBox-4.0.2_OSE.orig/src/libs/xpcom18a4/Makefile.kmk	2011-01-14 20:19:30.000000000 +0000
-+++ VirtualBox-4.0.2_OSE/src/libs/xpcom18a4/Makefile.kmk	2011-02-05 18:09:05.797482000 +0000
-@@ -471,9 +471,11 @@
-  xpidl_CFLAGS = \
- 	$(libIDL_config_cflags)
-  xpidl_LDFLAGS = \
--	$(libIDL_config_libs)
-+	$(filter-out -l%,$(libIDL_config_libs))
-  xpidl_LDFLAGS.linux = \
- 	$(VBOX_LD_as_needed)
-+ xpidl_LIBS = \
-+	$(patsubst -l%,%,$(filter -l%,$(libIDL_config_libs)))
- endif
- 
- #

virtualbox-ose_4.0.8-dfsg-1.diff.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fb505615ce9dc6549b4c48b0c629a6d5e7513791269fc0dcea51885afa0edb0e
+size 85952

virtualbox.changes

@@ -1,3 +1,125 @@
+-------------------------------------------------------------------
+Wed May 18 06:55:17 UTC 2011 - mseben@gmail.com
+
+- updated to Virtualbox 4.0.8 (maintenance release)
+  * Mac OS X hosts: fixed incompatibility with recent Mac OS X versions in 64-bit mode (bug #8474)
+  * Mac OS X hosts: fixed incompatibility with hosts with more than 16 cores (bug #8389)
+  * Mac OS X hosts: fixed painting corruptions on a second monitor in 64-bit mode (bug #7606)
+  * GUI: restored functionality to set an empty host key to disallow any host key combination (4.0.6 regression; bug #8793)
+  * VBoxManage: added controlvm screenshotpng subcommand for saving the screenshot of a running VM in PNG format
+  * VBoxHeadless: fixed potential crash during shutdown (Windows hosts only)
+  * NAT: built-in services use the correct Ethernet addresses in Ethernet header and in ARP requests
+  * Host-only networking: fixed adapter reference counting
+  * E1000: fixed rare guest crashes with Linux SMP guests (bug #8755)
+  * SATA: fixed guest disk corruption under rare circumstances (only relevant for guests with more than 2GB RAM; bug #8826)
+  * Storage: fixed data corruption after a snapshot was taken with asynchronous I/O enabled (bug #8498)
+  * Floppy: several improvement
+  * HPET: another fix for time jumps (bug #8707)
+  * USB: removed assumption that string descriptors are null-terminated (Windows hosts only)
+  * 3D support: fixed a potential crash when resizing the guest window
+  * 3D support: fixed GNOME 3 rendering under Ubuntu 11.04 and Fedora 15
+  * Snapshots: fixed another bug which could lose entries in the media registry when restoring a snapshot (bug #8363)
+  * Shared Folders: don't stop mounting the other valid folders if one host folder is inaccessible (4.0.6 regression)
+  * Linux Additions: check whether gcc and make are installed before building kernel modules (bug #8795)
+  * Solaris Additions: added support for X.Org Server 1.10
+  * Guest Additions: fixed inappropriate Guest Additions update notification when using vendor-specific version suffixes (bug #8844) 
+- deprecated vbox-gcc46.patch
+
+-------------------------------------------------------------------
+Fri May 13 03:29:45 UTC 2011 - crrodriguez@opensuse.org
+
+- Allow GCC 4.6 to be used 
+
+-------------------------------------------------------------------
+Tue Apr 26 19:42:44 UTC 2011 - crrodriguez@opensuse.org
+
+- Remove bundled libraries to ensure they are never used
+- USe system boost headers,only needed for xml parser it seems. 
+
+-------------------------------------------------------------------
+Fri Apr 22 16:35:55 UTC 2011 - mseben@gmail.com
+
+- updated to Virtualbox 4.0.6 (maintenance release)
+  * VMM: fixed incorrect handling of ballooned pages when restoring a VMM from a saved state
+  * VMM: don't crash on hosts with more than 64 cores / hyperthreads; implemented support for up to 256 host cores (except Windows hosts; bug #8489)
+  * VMM: fixed guru meditation for PAE guests running on hosts without PAE (bug #8006)
+  * VMM: fixed slow Linux guests with raw mode and recent guest kernels (bug #8726)
+  * GUI: support host key combinations (bug #979)
+  * GUI: fixed progress indicator (bug #7814)
+  * GUI: show the mouse pointer while the VM is paused if the USB tablet mouse emulation is used (bug #6799)
+  * GUI: adapt the snapshot folder as well when renaming a VM (bug #8469)
+  * GUI: persistently remember the last folders of the disk/DVD/floppy selectors
+  * GUI: never allow to start a VM with USB-2.0 activated if the proper extension pack is missing (bug #8182)
+  * GUI: fixed hang/crash when opening a file dialog in an non-existing folder (bug #8673)
+  * Snapshots: fixed a bug which could lose entries in the media registry when restoring a snapshot (bug #8363)
+  * Snapshots: allow snapshots to be stored in the VM directory
+  * 3D support: fixed a crash if a VM was forced to terminate (Windows hosts only; bug #7133)
+  * Storage: fixed memory leak (4.0 regression; bug #7966)
+  * Storage: fixed access to iSCSI targets over internal network
+  * Storage: fixed reading from disks with more than one snapshot for VHD and VMDK images with disabled host cache (bug #8408)
+  * Storage: fixed a possible hang during VM suspend after an I/O error occurred
+  * Storage: fixed a possible hang during VM suspend / reset (bug #8276, #8294)
+  * Storage: automatically create a diff image when attaching a streamOptimized VMDK image to a VM
+  * ATA/SATA: fixed automounting of virtual CD/DVD mediums with recent Linux distributions by correctly reporting the current profile as 'none' if no medium is present
+  * Buslogic: fixed emulation for certain guests (e.g. jRockit VE)
+  * Host-Only Networking: fixed interface creation failure on Windows hosts (4.0.4 regression; bug #8362)
+  * Host-Only & Bridged & Internal Networking: fix for processing promiscuous mode requests by VMs, defaulting to switch behaviour
+  * Host-Only Networking: fixed connectivity issue after resuming the host from sleep (bug #3625)
+  * Bridged Networking: support for interface bonding on Mac OS X hosts (bug #8731)
+  * NAT: fixed processing of ARP announcements for guests with static assigned IPs (bug #8609)
+  * VRDP: backward compatibility with VRDPAuth external authentication library (bug #8063)
+  * Shared Folders: don't fail to start a VM if a path is not absolute, for example when importing an OVF from a different host (bug #7941)
+  * Audio: fixed crash under certain conditions (bug #8527)
+  * USB: fixed a crash when plugging certain USB devices (bug #8699)
+  * HPET: fixed time jumps when reading the counter (bug #8707)
+  * OVF/OVA: automatically adjust disk paths if the VM name is changed on import
+  * OVF/OVA: fix export to slow medias
+  * OVF/OVA: automatically repair inconsistent appliances with multiple disks (bug #8253)
+  * rdesktop-vrdp: fixed an assertion triggered under certain conditions (bug #8593)
+  * Windows hosts: fixed occasional hangs during VM shutdown because sometimes COM was not properly uninitialized
+  * Mac OS X hosts: prevent the mouse from leaving the VM window while captured
+  * Mac OS X hosts: keep aspect ratio while resizing in scale mode (shift for old behaviour) (part of bug #7822)
+  * X11 hosts: fixed Yen key support (bug #8438)
+  * X11 hosts: fixed a regression which caused Host+F1 to pop up help instead of sending Ctrl+Alt+F1
+  * Linux hosts / Linux Additions: mangle IPRT symbols to allow installing VirtualBox inside a VM while the Guest Additions are active (bug #5686)
+  * Linux hosts / Linux guests: workaround for a bug in GLIBC older than version 1.11 leading to crashes under certain conditions (signed/unsigned problem with memchr on 64-bit machines)
+  * Solaris hosts: fixed a deadlock in event semaphores that could lead to unkillable VM processes
+  * Windows Additions: fixed Sysprep parameter handling
+  * Windows Additions: fixed spontaneous guest reboots under certain circumstances (4.0.2 regression; bugs #8406, #8429)
+  * Windows Additions: added auto logon support for locked workstations on legacy Windows versions
+  * Windows Additions: fixed driver bugcheck error when handling PnP messages (4.0 regression; bug #8367)
+  * Windows Additions: fixed memory leak in VBoxVideo
+  * X11 Additions: added support for X.Org Server 1.10 final
+  * Linux Additions: Linux kernel 2.6.39-rc1 fixes
+  * Linux Additions: improved auto-run support (bug #5509)
+  * Linux Additions: fix mouse support on SUSE 11 SP 1 guests (bug #7946)
+  * Solaris Additions: added support for X.Org Server 1.9
+  * Guest Additions: various bugfixes for guest control execution
+  * Webservice: use own log file, with log rotation to limit size
+- deprecated vbox-kernel-2.6.39.patch
+
+-------------------------------------------------------------------
+Fri Apr 15 23:01:48 UTC 2011 - crrodriguez@opensuse.org
+
+- remove the remaining build dates in binaries 
+
+-------------------------------------------------------------------
+Wed Apr 13 19:04:19 UTC 2011 - crrodriguez@opensuse.org
+
+- Fix build in kernel 2.6.39 
+
+-------------------------------------------------------------------
+Wed Apr 13 15:58:01 UTC 2011 - crrodriguez@opensuse.org
+
+- Fix build with as-needed 
+- DO not use static libstdc
+
+-------------------------------------------------------------------
+Mon Apr 11 19:32:03 UTC 2011 - crrodriguez@opensuse.org
+
+- Remove more build dates in binaries
+- VirtualBox no longer requires GCC 4.3 
+
 -------------------------------------------------------------------
 Fri Mar 25 07:42:21 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
@@ -30,7 +30,8 @@ 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:  hal-devel pulseaudio-devel xorg-x11 xorg-x11-devel xorg-x11-server xorg-x11-server-sdk
-BuildRequires:  LibVNCServer-devel gcc43-c++ kbuild pam-devel udev
+BuildRequires:  LibVNCServer-devel gcc gcc-c++ kbuild pam-devel udev quilt
+BuildRequires:  boost-devel
 %if %suse_version > 1110
 BuildRequires:  zlib-devel-static
 %endif
@@ -38,12 +39,12 @@ BuildRequires:  zlib-devel-static
 BuildRequires:  hal-32bit
 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:  gcc43-32bit libstdc++43-devel-32bit
+BuildRequires:  gcc-32bit  gcc-c++-32bit
 %endif
 #
 ExclusiveArch:  %ix86 x86_64
-Version:        4.0.4
+Version:        4.0.8
-Release:        4
+Release:        1
 Summary:        VirtualBox is an Emulator
 License:        GPLv2+
 Group:          System/Emulators/PC
@@ -83,7 +84,6 @@ Patch5:         vbox-config.diff
 #see thread : http://lists.freebsd.org/pipermail/freebsd-acpi/2010-October/006795.html
 Patch6:         vbox-smc-napa.diff
 #fix build of Python and dev package on openSUSE 11.3
-Patch7:         vbox-xpcom-kmk.diff
 Patch8:         vbox-python-detection.diff
 #PATCH-FIX-OPENSUSE implement messagebox (VBoxPermissionMessage app), which is displayed, when user
 #try to start VirtualBox and is not memeber of vboxusers group
@@ -93,6 +93,7 @@ Patch100:       vbox-no-build-dates.diff
 Patch101:       vbox-default-os-type.diff
 #disable update in vbox gui
 Patch102:       vbox-disable-updates.diff
+Patch103:       virtualbox-ose_%{version}-dfsg-1.diff.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         pwdutils permissions
 Requires:       %{name}-host-kmp = %version
@@ -176,7 +177,6 @@ VirtualBox guest addition tools.
 ###########################################
 %package -n python-%{name}
 
-
 Summary:        Python bindings for %{name}
 Group:          Development/Libraries/Python
 Requires:       %{name} = %{version}
@@ -202,12 +202,17 @@ Development file for %{name}
 ###########################################
 %prep
 %setup -q -n VirtualBox-%{version}_OSE
+%patch103 -p1
+export QUILT_PATCHES=debian/patches
+#echo "18-system-xorg.patch" > debian/patches/series
+echo "22-no-static-libstdcpp.patch" > debian/patches/series
+echo "29-fix-ftbfs-as-needed.patch" >> debian/patches/series
+quilt push -a
 %patch1
 %patch2
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 %patch8 -p1
 %patch99 -p1
 %patch100
@@ -217,17 +222,14 @@ Development file for %{name}
 %__cp %{S:1} ./UserManual.pdf
 
 %build
-# This package failed when testing with -Wl,-as-needed being default.
+#ensure we dont ever use them
-# So we disable it here, if you want to retest, just delete this comment and the line below.
+rm -rf src/libs/{libpng-*,libxml2-*,libxslt-*,zlib-*,boost-*}
-export SUSE_ASNEEDED=0
+
-#
 #	--disable-kmods \  				don't build Linux kernel modules -  but use SUSE specific way see few lines under
 #   --with-gcc=/usr/bin/gxx-4.3    	do configure and set proper gcc - currently vbox support only gcc<=4.4
 #   --nofatal                      	try to avoid build fail caused by missing makeself package
 ./configure \
 	--disable-kmods \
-	--with-gcc=gcc-4.3 \
-	--with-g++=g++-4.3 \
 	--disable-java \
 	--disable-docs \
 	--nofatal
@@ -240,7 +242,8 @@ source env.sh
 # 	VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= just disable some functionality in gui
 #   -j1 disable parallel build to avoid "Out of memory: Kill process" crash of build in buildservice
 /usr/bin/kmk \
-    -j1 \
+    -j2 \
+    VBOX_GCC_WERR= \
 	KBUILD_VERBOSE=2 \
 	VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= \
 	TOOL_YASM_AS=yasm \
@@ -428,14 +431,16 @@ pushd out/linux.*/release/bin
 popd
 
 # the build process tells us the desktop file is missing a semicolon...(repackage?)
-%__sed 's/^MimeType.*[^;]$/&;/' out/linux.*/release/bin/virtualbox.desktop > %{_tmppath}/virtualbox.desktop
+#%__sed 's/^MimeType.*[^;]$/&;/' out/linux.*/release/bin/virtualbox.desktop > %{_tmppath}/virtualbox.desktop
+#%__sed 's/Icon=VBox/Icon=VBox.png/' out/linux.*/release/bin/virtualbox.desktop > %{_tmppath}/virtualbox.desktop
 # install desktop file
-%__install -m 644 %{_tmppath}/virtualbox.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop
+#%__install -m 644 %{_tmppath}/virtualbox.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop
+%__install -m 644 out/linux.*/release/bin/virtualbox.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop
 %suse_update_desktop_file %{buildroot}%{_datadir}/applications/%{name}.desktop 'System Emulator'
 
 # create a menu entry
 %__install -m 644 out/linux.*/release/bin/VBox.png \
-									%{buildroot}%{_datadir}/pixmaps/
+									%{buildroot}%{_datadir}/pixmaps/virtualbox.png
 # install udev rule for host (virtualbox)
 %__install -m 644 %{SOURCE2} 		%{buildroot}%{_sysconfdir}/udev/rules.d/60-vboxdrv.rules
 # install config with session shutdown defs
@@ -443,6 +448,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
@@ -457,6 +463,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"
 ######################################################
@@ -510,6 +518,7 @@ groupadd -r vboxusers 2>/dev/null || :
 	%run_permissions
 %endif
 
+
 %verifyscript
 %if %suse_version >=1140
 	%verify_permissions -e %{_vbox_instdir}/VBoxNetDHCP
@@ -542,6 +551,7 @@ exit 0
 %restart_on_update vboxadd
 %insserv_cleanup
 
+
 %clean
 [ -d "%{buildroot}" -a "%{buildroot}" != "" ] && %__rm -rf "%{buildroot}"
 
@@ -602,7 +612,7 @@ exit 0
 %{_var}/adm/fillup-templates/sysconfig.vbox
 %{_sbindir}/rcvboxes
 %{_sbindir}/rcvboxdrv
-%if %suse_version > 1140
+%if %suse_version >= 1140
 %verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxNetDHCP
 %else
 %{_vbox_instdir}/VBoxNetDHCP
@@ -616,7 +626,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
@@ -628,7 +637,7 @@ exit 0
 #qm's translations
 %{_datadir}/virtualbox/nls
 %{_vbox_instdir}/VirtualBox.so
-%{_datadir}/pixmaps/VBox.png
+%{_datadir}/pixmaps/virtualbox.png
 %{_datadir}/applications/%{name}.desktop
 #