From 3065d4c643eb95c3a6aa5b494174c740d7bd1084 Mon Sep 17 00:00:00 2001 From: Grzegorz Pycia Date: Thu, 9 Mar 2017 15:28:21 +0100 Subject: [PATCH] - up to 5.1.16 - removed included upstream kernel-4.10.patch --- VirtualBox-kernel-4.10.patch | 13 ------------- VirtualBox.spec | 10 ++++------ 2 files changed, 4 insertions(+), 19 deletions(-) delete mode 100644 VirtualBox-kernel-4.10.patch diff --git a/VirtualBox-kernel-4.10.patch b/VirtualBox-kernel-4.10.patch deleted file mode 100644 index e5dbb8d..0000000 --- a/VirtualBox-kernel-4.10.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urN VirtualBox-5.1.14.orig/src/VBox/Additions/linux/sharedfolders/lnkops.c VirtualBox-5.1.14/src/VBox/Additions/linux/sharedfolders/lnkops.c ---- VirtualBox-5.1.14.orig/src/VBox/Additions/linux/sharedfolders/lnkops.c 2017-03-01 00:11:16.018923166 +0100 -+++ VirtualBox-5.1.14/src/VBox/Additions/linux/sharedfolders/lnkops.c 2017-03-01 00:12:22.178411297 +0100 -@@ -90,7 +90,9 @@ - - struct inode_operations sf_lnk_iops = - { -+# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) - .readlink = generic_readlink, -+# endif - # if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) - .get_link = sf_get_link - # elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) diff --git a/VirtualBox.spec b/VirtualBox.spec index 851f910..304c9e2 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -42,19 +42,19 @@ exit 1 %define qtver 5.3.2 -%define rel 2 +%define rel 1 %define pname VirtualBox 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.1.14 +Version: 5.1.16 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: 21eaec9f21477d555559a63761779880 +# Source0-md5: 37ebbd51370841eed8ab80f2f38446d6 Source1: http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso -# Source1-md5: 25576fe3fae42e51ea4766781c3100d2 +# Source1-md5: 967b230bd9fdedf7c9d05f9e23b3c8e6 Source2: vboxservice.init Source3: vboxservice.service Source4: vboxservice.sysconfig @@ -82,7 +82,6 @@ Patch14: %{pname}-no-scrextend.patch Patch15: %{pname}-multipython.patch Patch16: %{pname}-lightdm-1.19.2.patch Patch17: %{pname}-no-vboxvideo.patch -Patch18: %{pname}-kernel-4.10.patch URL: http://www.virtualbox.org/ %if %{with userspace} %ifarch %{x8664} @@ -541,7 +540,6 @@ cd ../..\ %patch15 -p0 %patch16 -p0 %patch17 -p0 -%patch18 -p1 %{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \ -e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in -- 2.43.0