pool/virtualbox
SHA256
4
0
Fork 2
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

- Leap 42.2 still has server v. 1.18.3, thus the test failed. The test has been changed to look at only the 1.xx part of the version.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=298
This commit is contained in:
Larry Finger 2016-12-05 17:05:34 +00:00 committed by Git OBS Bridge
parent 5abb7f5639
commit 9ae9af5d05
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
virtualbox.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Dec 5 17:03:34 UTC 2016 - Larry.Finger@lwfinger.net
- Leap 42.2 still has server v. 1.18.3, thus the test failed. The test has been changed to look at only the 1.xx part of the version.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Dec 4 16:59:29 UTC 2016 - Larry.Finger@lwfinger.net Sun Dec 4 16:59:29 UTC 2016 - Larry.Finger@lwfinger.net

6
virtualbox.spec
View File

@ -308,7 +308,7 @@ This package contains icons for guest desktop files that were created on the des
%prep %prep
xserver_str=`rpm -q xorg-x11-server` xserver_str=`rpm -q xorg-x11-server`
XSERVER_VERSION=`expr match "$xserver_str" '.*\(\([0-9]\.[0-9][0-9]\.[0-9]\)\)'` XSERVER_VERSION=`expr match "$xserver_str" '.*\(\([0-9]\.[0-9][0-9]\)\)'`
#XSERVER_VERSION=`echo $XSERVER_VERSION | sed -e 's/\.//g'` #XSERVER_VERSION=`echo $XSERVER_VERSION | sed -e 's/\.//g'`
%setup -q -n VirtualBox-%{version} %setup -q -n VirtualBox-%{version}
%patch1 -p1 %patch1 -p1
@ -334,8 +334,8 @@ XSERVER_VERSION=`expr match "$xserver_str" '.*\(\([0-9]\.[0-9][0-9]\.[0-9]\)\)'`
%patch113 -p1 %patch113 -p1
%patch114 -p1 %patch114 -p1
%patch115 -p1 %patch115 -p1
if [ "$XSERVER_VERSION" = "1.18.4" ] ; then if [ "$XSERVER_VERSION" = "1.18" ] ; then
echo "Patch 116 not applied" echo "Patch 116 not applied"
else else
%patch116 -p1 %patch116 -p1
fi fi