new patch to fix build with xorg 1.19

[packages/VirtualBox.git] / VirtualBox.spec

diff --git a/VirtualBox.spec b/VirtualBox.spec
index ebb6bca889f68becda0accc2ad7ef82d31909e8f..14784acb98899a634bd011bf20264747b4a3ff7e 100644 (file)
--- 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.4
+Version:       5.1.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: e25a6a1f3c113c373dc0433f9c2526f3
+# Source0-md5: 889d90a7d8119a6bcc699be258ca4a96
 Source1:       http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5: c24e2057a7dbc7d63e859c32638c321d
+# Source1-md5: 8cf1af35478905ea29828954ddb2c5ee
 Source2:       vboxservice.init
 Source3:       vboxservice.service
 Source4:       vboxservice.sysconfig
@@ -79,6 +79,9 @@ Patch11:      18-system-xorg.patch
 Patch12:       %{pname}-all-translations.patch
 Patch13:       x32.patch
 Patch14:       %{pname}-no-scrextend.patch
+Patch15:       %{pname}-multipython.patch
+Patch16:       %{pname}-lightdm-1.19.2.patch
+Patch17:       %{pname}-no-vboxvideo.patch
 URL:           http://www.virtualbox.org/
 %if %{with userspace}
 %ifarch %{x8664}
@@ -531,6 +534,9 @@ cd ../..\
 %endif
 %patch13 -p1
 %patch14 -p1
+%patch15 -p0
+%patch16 -p0
+%patch17 -p0
 
 %{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
        -e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in
@@ -567,7 +573,7 @@ cp -p src/VBox/Frontends/VirtualBox/images/os_{linux26,pld}_64.png
 cat <<'EOF'>> LocalConfig.kmk
 %{?with_verbose:KBUILD_VERBOSE=3}
 USERNAME=%(id -un)
-__VBOX_BUILD_PUBLISHER=_PLD
+VBOX_BUILD_PUBLISHER=_PLD
 VBOX_VERSION_STRING=$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)_PLD
 XSERVER_VERSION=%(rpm -q --queryformat '%{V}\n' xorg-xserver-server-devel | awk -F. '{ print $1 $2 }' 2>/dev/null || echo ERROR)
 VBOX_USE_SYSTEM_XORG_HEADERS=1
@@ -592,6 +598,7 @@ VBOX_WITH_TESTCASES :=
 VBOX_WITH_TESTSUITE :=
 
 VBOX_WITH_VRDP_RDESKTOP=
+VBOX_WITH_MULTIVERSION_PYTHON=0
 EOF
 
 %undefine      filterout_c
@@ -751,7 +758,7 @@ cd -
 done
 )
 
-rm -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/icons 
+rm -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/icons
 
 %{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname},/lib/udev}/VBoxCreateUSBNode.sh
 cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/udev/rules.d/60-vboxdrv.rules