commit c6a357129f4781d39c7d496196f6745fb84aabc8 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Tue Oct 17 18:02:46 2023 +0100 Update VirtualBox to 7.0.12 VirtualBox-7.0.2-update-Mageia-support.patch | 12 ++++----- VirtualBox.spec | 5 +++- sources | 4 +-- update_vbox.sh | 40 +++++++++++++++------------- 4 files changed, 34 insertions(+), 27 deletions(-) --- diff --git a/VirtualBox-7.0.2-update-Mageia-support.patch b/VirtualBox-7.0.2-update-Mageia-support.patch index ab37994..d253509 100644 --- a/VirtualBox-7.0.2-update-Mageia-support.patch +++ b/VirtualBox-7.0.2-update-Mageia-support.patch @@ -102,10 +102,10 @@ diff -Nurp VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qr diff -Nurp VirtualBox-7.0.2.orig/src/VBox/Installer/linux/distributions_rpm VirtualBox-7.0.2/src/VBox/Installer/linux/distributions_rpm --- VirtualBox-7.0.2.orig/src/VBox/Installer/linux/distributions_rpm 2022-10-19 21:28:54.000000000 +0300 +++ VirtualBox-7.0.2/src/VBox/Installer/linux/distributions_rpm 2022-10-22 12:48:25.951111079 +0300 -@@ -8,6 +8,21 @@ openSUSE114 = OPENSUSE_11_4 - openSUSE113 = OPENSUSE_11_3 - sles11.0 = SLES_11_0 - sles10.1 = SLES_10_1 +@@ -2,6 +2,21 @@ openSUSETW = OPENSUSE_TW + openSUSE155 = OPENSUSE_15_5 + openSUSE154 = OPENSUSE_15_4 + openSUSE153 = OPENSUSE_15_3 +mga15 = MAGEIA_15 +mga14 = MAGEIA_14 +mga13 = MAGEIA_13 @@ -121,9 +121,9 @@ diff -Nurp VirtualBox-7.0.2.orig/src/VBox/Installer/linux/distributions_rpm Virt +mga3 = MAGEIA_3 +mga2 = MAGEIA_2 +mga1 = MAGEIA_1 - mdv2011.0 = MANDRIVA_2011_0 + fedora38 = FEDORA_38 + fedora37 = FEDORA_37 fedora36 = FEDORA_36 - fedora35 = FEDORA_35 diff -Nurp VirtualBox-7.0.2.orig/src/VBox/Installer/linux/VBoxSysInfo.sh VirtualBox-7.0.2/src/VBox/Installer/linux/VBoxSysInfo.sh --- VirtualBox-7.0.2.orig/src/VBox/Installer/linux/VBoxSysInfo.sh 2022-10-19 21:28:54.000000000 +0300 +++ VirtualBox-7.0.2/src/VBox/Installer/linux/VBoxSysInfo.sh 2022-10-22 12:48:15.439111393 +0300 diff --git a/VirtualBox.spec b/VirtualBox.spec index 87c1e2f..dd743db 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -45,7 +45,7 @@ %bcond_without python3 Name: VirtualBox -Version: 7.0.10 +Version: 7.0.12 Release: 1%{?dist} Summary: A general-purpose full virtualizer for PC hardware @@ -900,6 +900,9 @@ getent passwd vboxadd >/dev/null || \ %{_datadir}/%{name}-kmod-%{version} %changelog +* Tue Oct 17 2023 Sérgio Basto <sergio(a)serjux.com&gt; - 7.0.12-1 +- Update VirtualBox to 7.0.12 + * Wed Jul 19 2023 Sérgio Basto <sergio(a)serjux.com&gt; - 7.0.10-1 - Update VirtualBox to 7.0.10 diff --git a/sources b/sources index 9e10e40..2bd2779 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (VirtualBox-7.0.10.tar.bz2) = 2870d39385f66557281edf1368db68cd69d6a9bebc30d52511929462d0ac210cec49dd8531a280c6facff22ba6e4808477fbf3d09abf998d863a007fc7f2c3bd -SHA512 (UserManual.pdf) = 24bb1741e6cb0f8dcfa32e534e2f54c0cd585b1761d57de499bfa631b04a2ebb9253c72bf841efc24d4890d6d852b1cc7fbb17cac823d70d02b8ecaf487ef08e +SHA512 (VirtualBox-7.0.12.tar.bz2) = 9fe4511442eba788d02f932f5e98cfcc5aa4ebed41c00bd7333cf7e3f5de787e458f1f56930978283f041f403652c803143335fe9120ab63a2c113ca7b3f588f +SHA512 (UserManual.pdf) = 8f5dc56d8ca055a79b80785abf91a9aa44338240c5839ff3a362711aa513f315c4b4e8e0f25a2a71274b335a03a264feca1c7d0b1751188d212c4e76ffea1233 diff --git a/update_vbox.sh b/update_vbox.sh index 706c317..90aa7f4 100755 --- a/update_vbox.sh +++ b/update_vbox.sh @@ -1,7 +1,7 @@ -VERSION=7.0.10 +VERSION=7.0.12 REL=1 -RAWHIDE=39 -REPOS="f38 f37 el9 el8" +RAWHIDE=40 +REPOS="f39 f38 f37 el9 el8" if [ -z "$1" ] then stage=0 @@ -14,17 +14,21 @@ then echo STAGE 0 git checkout master git pull -if test $REL -eq 1 -then -rpmdev-bumpspec -n $VERSION -c "Update VirtualBox to $VERSION" VirtualBox.spec -rm UserManual.pdf -spectool -g VirtualBox.spec -# we need update sources files to avoid download the wrong UserManual.pdf -rfpkg new-sources ./VirtualBox-$VERSION.tar.bz2 ./UserManual.pdf -echo "checking patches" -rfpkg prep + if test $REL -eq 1 + then + rpmdev-bumpspec -n $VERSION -c "Update VirtualBox to $VERSION" VirtualBox.spec + rm UserManual.pdf + spectool -g VirtualBox.spec + # we need update sources files to avoid download the wrong UserManual.pdf + rfpkg new-sources ./VirtualBox-$VERSION.tar.bz2 ./UserManual.pdf + echo "checking patches" + rfpkg prep + fi fi +if test $stage -le 1 +then +echo STAGE 1 echo Press enter scratch-build or n to skip ; read dummy; if [[ "$dummy" != "n" ]]; then rfpkg scratch-build --srpm @@ -35,23 +39,23 @@ echo Press enter to build on corp -build or n to skip ; read dummy; fi fi -if test $stage -le 1 +if test $stage -le 2 then -echo STAGE 1 +echo STAGE 2 echo Press enter to commit; read dummy; rfpkg ci -c && git show fi -if test $stage -le 2 +if test $stage -le 3 then -echo STAGE 2 +echo STAGE 3 echo Press enter to push and build on rawhide; read dummy; rfpkg push && rfpkg build --nowait fi -if test $stage -le 3 +if test $stage -le 4 then -echo STAGE 3 +echo STAGE 4 for repo in $REPOS ; do echo Press enter to build on branch $repo or n to skip; read dummy; if [[ "$dummy" != "n" ]]; then