- I now have the necessary preprocessor symbol to modify the source depending on whether the server is 1.19.0 or greater.

It is no longer necessary to detect the server version in the spec file, thus the solution is cleaner.

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=299

virtualbox.spec

@@ -307,9 +307,6 @@ 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]\)\)'`
-#XSERVER_VERSION=`echo $XSERVER_VERSION | sed -e 's/\.//g'`
 %setup -q -n VirtualBox-%{version}
 %patch1 -p1
 %patch2 -p1
@@ -334,11 +331,7 @@ XSERVER_VERSION=`expr match "$xserver_str" '.*\(\([0-9]\.[0-9][0-9]\)\)'`
 %patch113 -p1
 %patch114 -p1
 %patch115 -p1
-if [ "$XSERVER_VERSION" = "1.18" ] ; then
-echo "Patch 116 not applied"
-else
 %patch116 -p1
-fi
 
 #copy user manual
 cp %{SOURCE1} UserManual.pdf