commit f5b0ad6d97e67103d64ffe6ffcc00a5848dea790 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Fri Oct 19 03:17:03 2018 +0100 Update VBox to 5.2.20 .gitignore | 1 + VirtualBox.spec | 8 +++++++- sources | 2 +- update_vbox.sh | 19 ++++++++++++++++++- 4 files changed, 27 insertions(+), 3 deletions(-) --- diff --git a/.gitignore b/.gitignore index 1d441fa..1c38d61 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ VirtualBox-5.0.16.tar.bz2 /VirtualBox-5.2.14.tar.bz2 /VirtualBox-5.2.16.tar.bz2 /VirtualBox-5.2.18.tar.bz2 +/VirtualBox-5.2.20.tar.bz2 diff --git a/VirtualBox.spec b/VirtualBox.spec index 775c4a6..627c503 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -36,7 +36,7 @@ %endif Name: VirtualBox -Version: 5.2.18 +Version: 5.2.20 #Release: 1%%{?prerel:.%%{prerel}}%%{?dist} Release: 1%{?dist} Summary: A general-purpose full virtualizer for PC hardware @@ -388,6 +388,9 @@ install -p -m 0755 obj/bin/VBox.sh %{buildroot}%{_bindir}/VBox install -p -m 0755 -t %{buildroot}%{_bindir} \ obj/bin/VBoxTunctl +# Fixes ERROR: ambiguous python shebang in F30 +sed -i '1s:#!/usr/bin/env python:#!/usr/bin/env python2:' obj/bin/vboxshell.py + # Executables install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox \ obj/bin/VirtualBox \ @@ -772,6 +775,9 @@ getent passwd vboxadd >/dev/null || \ %{_datadir}/%{name}-kmod-%{version} %changelog +* Thu Oct 18 2018 Sérgio Basto <sergio(a)serjux.com&gt; - 5.2.20-1 +- Update VBox to 5.2.20 + * Fri Aug 24 2018 Sérgio Basto <sergio(a)serjux.com&gt; - 5.2.18-1 - Update VBox to 5.2.18 diff --git a/sources b/sources index a5b5270..9b55990 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d8e291525b84569356773eef507c49ce VirtualBox-5.2.18.tar.bz2 +ba93e3de1689c5c4048abf17872ef149 VirtualBox-5.2.20.tar.bz2 diff --git a/update_vbox.sh b/update_vbox.sh index 098ac7c..423a941 100755 --- a/update_vbox.sh +++ b/update_vbox.sh @@ -1,9 +1,25 @@ -VERSION=5.2.18 +VERSION=5.2.20 REL=1 +if [ -z "$1" ] +then + stage=0 +else + stage=$1 +fi +if test $stage -le 0 +then +echo STAGE 0 git pull rpmdev-bumpspec -n $VERSION -c "Update VBox to $VERSION" VirtualBox.spec spectool -g VirtualBox.spec +rfpkg srpm && copr-cli build sergiomb/vboxfor23 VirtualBox-$VERSION-$REL.fc30.src.rpm +echo Press enter to continue; read dummy; +fi + +if test $stage -le 1 +then +echo STAGE 1 rfpkg new-sources ./VirtualBox-$VERSION.tar.bz2 rfpkg ci -c && git show echo Press enter to continue; read dummy; @@ -46,3 +62,4 @@ Press enter to continue; read dummy; koji-rpmfusion tag-build el7-free-override VirtualBox-$VERSION-$REL.el7 koji-rpmfusion wait-repo el7-free-build --build=VirtualBox-$VERSION-$REL.el7 git checkout el7 && git merge master && git push && rfpkg build --nowait; git checkout master" +fi