merge our and upstream wrapper; sort files

diff --git a/VirtualBox.sh b/VirtualBox.sh
deleted file mode 100644 (file)
index d9c1ea9..0000000
--- a/VirtualBox.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-BINFILE=$(basename "$0")
-VBOXDIR=@LIBDIR@/VirtualBox
-
-show_message() {
-       if [ ! -z "$DISPLAY" ] && [ -x /usr/bin/gxmessage ]; then
-               echo -e "$1" | gxmessage --center --buttons GTK_STOCK_OK -wrap -geometry 400x150 -name $BINFILE -file -
-       else
-               echo -e "$1"
-       fi
-}
-
-if [ ! -d "$VBOXDIR" ]; then
-       show_message "Can't find VirtualBox libraries! Can't continue!.\nCorrect this situation or contact with your system administrator."
-       exit 1
-fi
-
-if [ ! -c /dev/vboxdrv ]; then
-       show_message "Special character device /dev/vboxdrv doesn't exists!\nCheck your installation and whether vboxdrv kernel module is loaded."
-       exit 1
-fi
-
-if [ ! -w /dev/vboxdrv ]; then
-       show_message "You don't have write access to /dev/vboxdrv!\nCorrect this situation or contact with your system administrator."
-       exit 1
-fi
-
-export LD_LIBRARY_PATH=$VBOXDIR
-exec $VBOXDIR/$BINFILE ${1:+"$@"}

diff --git a/VirtualBox.spec b/VirtualBox.spec
index 6d2db1a3187670b95b46fa29661a5d8f1654c038..f78deab2d3e933ab625e11099d93142cc818139f 100644 (file)
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -71,7 +71,6 @@ Source1:      http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions
 # Source1-md5: f23d3980a509418b2dcb614483271ffa
 Source2:       vboxservice.init
 Source3:       vboxservice.service
-Source4:       %{pname}.sh
 Source5:       mount.vdi
 Source6:       udev.rules
 Source7:       %{pname}-virtualbox-host-modules-load.conf
@@ -532,7 +531,6 @@ cd ../..\
 %{__sed} -i -e "s@_LDFLAGS\.%{vbox_arch}*.*=@& %{rpmldflags}@g" \
        -i Config.kmk src/libs/xpcom18a4/Config.kmk
 
-%{__sed} 's#@LIBDIR@#%{_libdir}#' < %{SOURCE4} > VirtualBox-wrapper.sh
 %{__sed} -i -e 's#@INSTALL_DIR@#%{_libdir}/%{pname}#' src/VBox/Installer/linux/VBox.sh
 
 install -d PLD-MODULE-BUILD/{GuestDrivers,HostDrivers}
@@ -831,58 +829,61 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) /sbin/mount.vdi
+%attr(755,root,root) %{_bindir}/VBox
+%attr(755,root,root) %{_bindir}/VBoxAutostart
+%attr(755,root,root) %{_bindir}/VBoxBalloonCtrl
 %attr(755,root,root) %{_bindir}/VBoxHeadless
 %attr(755,root,root) %{_bindir}/VBoxManage
 %attr(755,root,root) %{_bindir}/VBoxSDL
 %attr(755,root,root) %{_bindir}/VBoxTunctl
-%attr(755,root,root) %{_bindir}/VBox
-%attr(755,root,root) %{_bindir}/VBoxAutostart
-%attr(755,root,root) %{_bindir}/VBoxBalloonCtrl
 %dir %{_libdir}/%{pname}
+# libraries
 %attr(755,root,root) %{_libdir}/%{pname}/DBGCPlugInDiggers.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxAuth.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxAuthSimple.so
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxAutostart
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxBalloonCtrl
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxDD2.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxDD.so
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxDD2.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxDDU.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxDragAndDropSvc.so
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxExtPackHelperApp
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxGuestControlSvc.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxGuestPropSvc.so
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxHeadless
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxHostChannel.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxKeyboard.so
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxManage
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxNetNAT
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxVolInfo
-%attr(755,root,root) %{_libdir}/%{pname}/iPxeBaseBin
-%if %{with doc}
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxManageHelp
-%endif
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxNetAdpCtl
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxNetDHCP
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxOGLhostcrutil.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxOGLhosterrorspu.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxOGLrenderspu.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxPython*.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxREM.so
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxRT.so
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxSharedClipboard.so
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxSharedCrOpenGL.so
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxSharedFolders.so
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxVMM.so
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxXPCOM.so
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxXPCOMC.so
 %ifarch %{ix86}
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxREM32.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxREM64.so
 %endif
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxRT.so
+
+# binaries
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxAutostart
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxBalloonCtrl
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxExtPackHelperApp
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxHeadless
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxManage
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxNetAdpCtl
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxNetDHCP
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxNetNAT
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxSDL
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxSharedClipboard.so
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxSharedCrOpenGL.so
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxSharedFolders.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxSVC
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxVMM.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxVMMPreload
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxXPCOMC.so
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxVolInfo
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxXPCOMIPCD
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxXPCOM.so
+%attr(755,root,root) %{_libdir}/%{pname}/iPxeBaseBin
+%if %{with doc}
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxManageHelp
+%endif
 
 %dir %{_libdir}/%{pname}/ExtensionPacks
 %{_libdir}/%{pname}/ExtensionPacks/VNC/ExtPack.xml
@@ -921,9 +922,9 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 %files gui
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/VirtualBox
-%attr(755,root,root) %{_libdir}/%{pname}/VirtualBox
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxDbg.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxTestOGL
+%attr(755,root,root) %{_libdir}/%{pname}/VirtualBox
 %dir %{_datadir}/%{pname}/nls
 %lang(bg) %{_datadir}/%{pname}/nls/*_bg.qm
 %lang(ca) %{_datadir}/%{pname}/nls/*_ca.qm

diff --git a/wrapper.patch b/wrapper.patch
index ca0e8c8a4732e1943dffab1f11a821690fbf6d72..112705737f79301705de11ac7ebaaac19708544b 100644 (file)
--- a/wrapper.patch
+++ b/wrapper.patch
@@ -1,6 +1,22 @@
---- VirtualBox-4.3.8/src/VBox/Installer/linux/VBox.sh~ 2014-02-25 19:09:10.000000000 +0200
-+++ VirtualBox-4.3.8/src/VBox/Installer/linux/VBox.sh  2014-03-01 14:07:14.898417429 +0200
-@@ -19,9 +19,9 @@
+--- VirtualBox-4.3.8/src/VBox/Installer/linux/VBox.sh  2014-03-01 14:07:14.898417429 +0200
++++ VirtualBox-4.3.8/src/VBox/Installer/linux/VBox.sh  2014-03-01 18:25:47.973662413 +0200
+@@ -16,14 +16,27 @@
+ PATH="/usr/bin:/bin:/usr/sbin:/sbin"
+ CONFIG="/etc/vbox/vbox.cfg"
+ 
++show_message() {
++      local BINFILE=${0##*/} message
++
++      if [ -n "$DISPLAY" ] && [ -x /usr/bin/gxmessage ]; then
++              gxmessage --center --buttons GTK_STOCK_OK -wrap -geometry 400x150 -name $BINFILE -file -
++      elif [ -n "$DISPLAY" ] && [ -x /usr/bin/zenity ]; then
++              message=$(cat)
++              zenity --error --icon-name=virtualbox --text "$message"
++      else
++              cat >&2
++      fi
++}
++
  test -r "${CONFIG}" &&
      . "${CONFIG}"
  test -z "${INSTALL_DIR}" &&
@@ -8,8 +24,38 @@
 -        test -x /usr/lib/virtualbox/VirtualBox; then
 -        INSTALL_DIR=/usr/lib/virtualbox
 +    if test -f @INSTALL_DIR@/VBoxSVC &&
-+        test -x @INSTALL_DIR@/VBoxSVC; then
++        test -x @INSTALL_DIR@/VBoxSVCr; then
 +        INSTALL_DIR=@INSTALL_DIR@
      else
-         echo "Could not find VirtualBox installation. Please reinstall."
+-        echo "Could not find VirtualBox installation. Please reinstall."
++        echo "Could not find VirtualBox installation. Please reinstall." | show_message
          exit 1
+     fi
+ 
+@@ -33,7 +46,7 @@
+ if [ "$1" = "shutdown" ]; then
+     SHUTDOWN="true"
+ elif ! lsmod|grep -q vboxdrv; then
+-    cat << EOF
++    show_message << EOF
+ WARNING: The vboxdrv kernel module is not loaded. Either there is no module
+          available for the current kernel (`uname -r`) or it failed to
+          load. Please recompile the kernel module and install it by
+@@ -43,7 +56,7 @@
+          You will not be able to start VMs until this problem is fixed.
+ EOF
+ elif [ ! -c /dev/vboxdrv ]; then
+-    cat << EOF
++    show_message << EOF
+ WARNING: The character device /dev/vboxdrv does not exist. Try
+ 
+            sudo /etc/init.d/vboxdrv restart
+@@ -55,7 +68,7 @@
+ fi
+ 
+ if [ -f /etc/vbox/module_not_compiled ]; then
+-    cat << EOF
++    show_message << EOF
+ WARNING: The compilation of the vboxdrv.ko kernel module failed during the
+          installation for some reason. Starting a VM will not be possible.
+          Please consult the User Manual for build instructions.