commit 5316b42e13e25e3264f92d90cbead1f4938a48e7 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Sun Jul 26 03:50:13 2020 +0100 Update to 6.1.12 VirtualBox-kmod.spec | 5 ++++- update_vbox.sh | 27 +++++++++------------------ 2 files changed, 13 insertions(+), 19 deletions(-) --- diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec index b096f78..ecdd70d 100644 --- a/VirtualBox-kmod.spec +++ b/VirtualBox-kmod.spec @@ -36,7 +36,7 @@ %global __arch_install_post /usr/lib/rpm/check-rpaths /usr/lib/rpm/check-buildroot Name: VirtualBox-kmod -Version: 6.1.10 +Version: 6.1.12 Release: 1%{?dist} #Release: 1%%{?prerel:.%%{prerel}}%%{?dist} @@ -131,6 +131,9 @@ DIRS=$(ls %{name}-%{version} |wc -l) %changelog +* Sun Jul 26 2020 Sérgio Basto <sergio(a)serjux.com&gt; - 6.1.12-1 +- Update to 6.1.12 + * Mon Jun 08 2020 Sérgio Basto <sergio(a)serjux.com&gt; - 6.1.10-1 - Update to 6.1.10 diff --git a/update_vbox.sh b/update_vbox.sh index 5cf1ad2..dd96c70 100755 --- a/update_vbox.sh +++ b/update_vbox.sh @@ -1,7 +1,7 @@ -VERSION=6.1.10 +VERSION=6.1.12 REL=1 RAWHIDE=33 -REPOS="32 31" +REPOS="f32 f31 el8 el7" if [ -z "$1" ] then @@ -27,8 +27,7 @@ echo Press enter to continue; read dummy; #koji-rpmfusion watch-task fi -if test $stage -le 1 -then +if test $stage -le 1; then echo STAGE 1 BRANCH1=f$RAWHIDE BRANCH2=fc$RAWHIDE @@ -37,12 +36,14 @@ koji-rpmfusion tag-build $BRANCH1-free-override VirtualBox-$VERSION-$REL.$BRANCH rfpkg push && rfpkg build --nowait ) & fi -if test $stage -le 2 -then +if test $stage -le 2; then echo STAGE 2 for repo in $REPOS ; do -BRANCH1=f$repo -BRANCH2=fc$repo +BRANCH1=$repo +BRANCH2=$repo +if [[ $i == f* ]]; then + BRANCH2=fc${i:1} +fi echo Press enter tag-build $BRANCH1 to continue; read dummy; koji-rpmfusion tag-build $BRANCH1-free-override VirtualBox-$VERSION-$REL.$BRANCH2 (koji-rpmfusion wait-repo $BRANCH1-free-build --build=VirtualBox-$VERSION-$REL.$BRANCH2 && \ @@ -50,14 +51,4 @@ git checkout $BRANCH1 && git merge master && git push && rfpkg build --nowait; g done fi -if test $stage -le 3 -then -echo STAGE 3 -BRANCH1=el7 -BRANCH2=el7 -echo Press enter tag-build $BRANCH1 to continue; read dummy; -koji-rpmfusion tag-build el7-free-override VirtualBox-$VERSION-$REL.el7 -koji-rpmfusion wait-repo $BRANCH1-free-build --build=VirtualBox-$VERSION-$REL.$BRANCH2 -git checkout $BRANCH1 && git merge master && git push && rfpkg build --nowait; git checkout master -fi echo Finish