commit 34796e5030256823ac8dd1651630386959e612bc Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Wed Sep 22 11:47:08 2021 +0100 On create vm defaults to Linux and minor improvements ...-os-type.diff => VirtualBox-6.0.0-default-to-Fedora.patch | 12 ++++++++++++ VirtualBox.spec | 3 ++- update_vbox.sh | 9 ++++++++- 3 files changed, 22 insertions(+), 2 deletions(-) --- diff --git a/vbox-default-os-type.diff b/VirtualBox-6.0.0-default-to-Fedora.patch similarity index 73% rename from vbox-default-os-type.diff rename to VirtualBox-6.0.0-default-to-Fedora.patch index dccfe1c..20a4a8f 100644 --- a/vbox-default-os-type.diff +++ b/VirtualBox-6.0.0-default-to-Fedora.patch @@ -1,3 +1,4 @@ +Defaults to Linux and to Fedora Index: VirtualBox-6.0.0/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp =================================================================== --- VirtualBox-6.0.0.orig/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp @@ -23,3 +24,14 @@ Index: VirtualBox-6.0.0/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSyste } /* Else simply select the first one present: */ else +@@ -468,6 +468,10 @@ void UINameAndSystemEditor::prepareFamil + + /* Choose the 1st item to be the current: */ + m_pComboFamily->setCurrentIndex(0); ++ /* Default to Linux */ ++ const int liIndex = m_pComboFamily->findData("Linux", TypeID); ++ if (liIndex != -1) ++ m_pComboFamily->setCurrentIndex(liIndex); + /* And update the linked widgets accordingly: */ + sltFamilyChanged(m_pComboFamily->currentIndex()); + } diff --git a/VirtualBox.spec b/VirtualBox.spec index 4f7d97e..26ac948 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -74,7 +74,7 @@ Source26: os_mageia_x4.png Source27: os_mageia_64_x4.png Patch1: VirtualBox-6.0.0-noupdate.patch Patch2: VirtualBox-6.1.0-strings.patch -Patch3: vbox-default-os-type.diff +Patch3: VirtualBox-6.0.0-default-to-Fedora.patch #Patch27: VirtualBox-gcc.patch #to revert on EL7 Patch29: 590355dbdcffa4081c377fd31565e172785b390c.patch @@ -100,6 +100,7 @@ Patch86: VirtualBox-6.1.0-VBoxRem.patch Patch88: VirtualBox-lzf.patch Patch89: changeset_90377.diff +BuildRequires: gcc-c++ BuildRequires: kBuild >= 0.1.9998.r3093 BuildRequires: SDL-devel BuildRequires: openssl-devel diff --git a/update_vbox.sh b/update_vbox.sh index 5eb93de..9d6cecd 100755 --- a/update_vbox.sh +++ b/update_vbox.sh @@ -22,7 +22,14 @@ 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 fi -rfpkg srpm && copr-cli build sergiomb/vboxfor23 VirtualBox-$VERSION-$REL.fc$RAWHIDE.src.rpm +echo Press enter scratch-build or n to skip ; read dummy; + if [[ "$dummy" != "n" ]]; then + rfpkg scratch-build --srpm + fi +echo Press enter to build on corp -build or n to skip ; read dummy; + if [[ "$dummy" != "n" ]]; then + rfpkg srpm && copr-cli build sergiomb/vboxfor23 VirtualBox-$VERSION-$REL.fc$RAWHIDE.src.rpm + fi fi if test $stage -le 1