1
0
forked from jengelh/virtualbox

- Add patch file "Fix_for_server_1.19.patch" to support xorg-x11-server v. 1.19.0.

The spec file now interrogates the rpm for the server and conditionally applies the patch, thus both versions build OK.

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=297
This commit is contained in:
Larry Finger
2016-12-05 03:50:25 +00:00
committed by Git OBS Bridge
parent 10c3b9cf5c
commit 5abb7f5639
3 changed files with 83 additions and 0 deletions

View File

@@ -92,6 +92,8 @@ Patch113: vbox_remove_smp_mflags.patch
Patch114: vbox_fix_4.9_api_changes.patch
# Add support for HiDPI in the management frontend
Patch115: vbox_hidpi_support.patch
# Fix for missing include needed for server 1.19
Patch116: Fix_for_server_1.19.patch
#
BuildRequires: LibVNCServer-devel
BuildRequires: SDL-devel
@@ -130,6 +132,7 @@ BuildRequires: update-desktop-files
BuildRequires: which
BuildRequires: xorg-x11
BuildRequires: xorg-x11-server
#BuildRequires: xorg-x11-server > 7.6_1.18.4-2.1
BuildRequires: xorg-x11-server-sdk
BuildRequires: yasm
BuildRequires: zlib-devel-static
@@ -304,6 +307,9 @@ This package contains icons for guest desktop files that were created on the des
###########################################
%prep
xserver_str=`rpm -q xorg-x11-server`
XSERVER_VERSION=`expr match "$xserver_str" '.*\(\([0-9]\.[0-9][0-9]\.[0-9]\)\)'`
#XSERVER_VERSION=`echo $XSERVER_VERSION | sed -e 's/\.//g'`
%setup -q -n VirtualBox-%{version}
%patch1 -p1
%patch2 -p1
@@ -328,6 +334,11 @@ This package contains icons for guest desktop files that were created on the des
%patch113 -p1
%patch114 -p1
%patch115 -p1
if [ "$XSERVER_VERSION" = "1.18.4" ] ; then
echo "Patch 116 not applied"
else
%patch116 -p1
fi
#copy user manual
cp %{SOURCE1} UserManual.pdf