up to 5.0.10

- moc patch removed (included in this release)
- mount.vboxsf is no longer part of kernel so use binary built by
  userpsace instead of doing it manually with missing flags

diff --git a/VirtualBox-moc.patch b/VirtualBox-moc.patch
deleted file mode 100644 (file)
index f859b74..0000000
--- a/VirtualBox-moc.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- configure.old      2015-10-02 14:46:38.000000000 +0200
-+++ configure  2015-10-19 21:12:04.440451289 +0200
-@@ -1591,20 +1591,18 @@
-           cnf_append "PATH_SDK_QT4_LIB" '$'"(firstword `strip_L "$LIBQT4"`)"
-           if [ "$foundqt4" = "2" ]; then
-             cnf_append "VBOX_WITH_QT4_SUN" "1"
--          elif [ "$foundqt4" = "3" ]; then
--            cnf_append "VBOX_PATH_QT4" "$TOOLQT4"
--            cnf_append "PATH_SDK_QT4" "$TOOLQT4"
--            cnf_append "PATH_TOOL_QT4_BIN" "$TOOLQT4BIN"
--            return
-+          fi
-+          if ! [ "$foundqt4" = "3" ]; then
-+            TOOLQT4BIN="$TOOLQT4/bin"
-           fi
-           test_header "Qt4 devtools"
-           # try it with a suffix, some platforms use that
--          if which_wrapper "$TOOLQT4/bin/moc-qt4" > /dev/null; then
-+          if which_wrapper "$TOOLQT4BIN/moc-qt4" > /dev/null; then
-             QT4BINSUFF="-qt4"
-           else
-             QT4BINSUFF=""
-           fi
--          moc_ver=`$TOOLQT4/bin/moc$QT4BINSUFF -v 2>&1|sed 's+^.*(Qt \(.*\))+\1+'`
-+          moc_ver=`$TOOLQT4BIN/moc$QT4BINSUFF -v 2>&1|sed 's+^.*(Qt \(.*\))+\1+'`
-           if [ $? -ne 0 ]; then
-             log_failure "moc$QT4BINSUFF not working"
-             fail
-@@ -1612,7 +1610,7 @@
-             log_success "found version $moc_ver"
-             cnf_append "VBOX_PATH_QT4" "$TOOLQT4"
-             cnf_append "PATH_SDK_QT4" "$TOOLQT4"
--            cnf_append "PATH_TOOL_QT4_BIN" "$TOOLQT4/bin"
-+            cnf_append "PATH_TOOL_QT4_BIN" "$TOOLQT4BIN"
-             [ -n "$QT4BINSUFF" ] && cnf_append "TOOL_QT4_BIN_SUFF" "$QT4BINSUFF"
-           fi
-         fi

diff --git a/VirtualBox.spec b/VirtualBox.spec
index fa675389bd95d5b16281f0e0d4b2c73d16e03d10..2f95ce7e3ff9217dad6292d55b70ef1b8283b9ab 100644 (file)
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -47,14 +47,14 @@ exit 1
 Summary:       VirtualBox - x86 hardware virtualizer
 Summary(pl.UTF-8):     VirtualBox - wirtualizator sprzętu x86
 Name:          %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version:       5.0.8
+Version:       5.0.10
 Release:       %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 License:       GPL v2
 Group:         Applications/Emulators
 Source0:       http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2
-# Source0-md5: 8853a2ba183ecf255d0dc19b7584515f
+# Source0-md5: b978c28a021d637489beb23f7b1380e2
 Source1:       http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5: 28aa52d82296604e698e281a33cdaa3d
+# Source1-md5: cb17e3e74d1fb72bbc521586f9af10a4
 Source2:       vboxservice.init
 Source3:       vboxservice.service
 Source5:       mount.vdi
@@ -78,7 +78,6 @@ Patch11:      18-system-xorg.patch
 Patch12:       %{pname}-all-translations.patch
 Patch13:       x32.patch
 Patch14:       %{pname}-no-scrextend.patch
-Patch15:       %{pname}-moc.patch
 URL:           http://www.virtualbox.org/
 %if %{with userspace}
 %ifarch %{x8664}
@@ -527,7 +526,6 @@ cd ../..\
 %endif
 %patch13 -p1
 %patch14 -p1
-%patch15 -p0
 
 %{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
        -e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in
@@ -608,8 +606,6 @@ EOF
 
 . "$PWD/env.sh"
 kmk %{?_smp_mflags}
-
-%{__cc} %{rpmcflags} %{rpmldflags} -Wall -Werror src/VBox/Additions/linux/sharedfolders/{mount.vboxsf.c,vbsfmount.c} -o mount.vboxsf
 %endif
 
 %{?with_kernel:%{expand:%build_kernel_packages}}
@@ -681,8 +677,7 @@ install -d $RPM_BUILD_ROOT/%{_lib}/security
 %{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,/%{_lib}/security}/pam_vbox.so
 
 # mount.vboxsf
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/mount.vboxsf
-install -p mount.vboxsf $RPM_BUILD_ROOT/sbin/mount.vboxsf
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/mount.vboxsf $RPM_BUILD_ROOT/sbin/mount.vboxsf
 
 # mount.vdi
 install -p %{SOURCE5} $RPM_BUILD_ROOT/sbin/mount.vdi