Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/anaconda.git#2a73162012beb06e283cbf39f7cca942b6a91c7c

0006-Choose-the-best-locale-more-carefully-1933384.patch

@@ -0,0 +1,29 @@
+From 00bd48ce9a7ac00e6b47610a9477b43016acd080 Mon Sep 17 00:00:00 2001
+From: Vendula Poncova <vponcova@redhat.com>
+Date: Mon, 1 Mar 2021 11:54:34 +0100
+Subject: [PATCH] Choose the best locale more carefully (#1933384)
+
+Use the default locale if there are no locales to choose from.
+
+Resolves: rhbz#1933384
+---
+ pyanaconda/ui/gui/spokes/welcome.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/pyanaconda/ui/gui/spokes/welcome.py b/pyanaconda/ui/gui/spokes/welcome.py
+index fb49188c1..0e17d8106 100644
+--- a/pyanaconda/ui/gui/spokes/welcome.py
++++ b/pyanaconda/ui/gui/spokes/welcome.py
+@@ -228,7 +228,8 @@ class WelcomeLanguageSpoke(StandaloneSpoke, LangLocaleHandler):
+         store.set(commonLangsItr, 0, "", 1, "", 2, "", 3, True)
+ 
+         # setup the "best" locale
+-        locale = localization.setup_locale(locales[0], self._l12_module)
++        best_locale = locales[0] if locales else DEFAULT_LANG
++        locale = localization.setup_locale(best_locale, self._l12_module)
+         self._set_lang(locale)
+         self._select_locale(self._l12_module.Language)
+ 
+-- 
+2.26.2
+

anaconda.spec

@@ -1,7 +1,7 @@
 Summary: Graphical system installer
 Name:    anaconda
 Version: 34.24.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and MIT
 URL:     http://fedoraproject.org/wiki/Anaconda
 
@@ -25,6 +25,7 @@ Patch2: 0003-Do-not-require-inst.-prefixes-for-Anaconda-boot-argu.patch
 
 Patch3: 0004-Determine-GRUB-directory-relative-path-to-use-in-con.patch
 Patch4: 0005-The-network-spoke-should-be-visible-in-live-spins-19.patch
+Patch5: 0006-Choose-the-best-locale-more-carefully-1933384.patch
 
 # Versions of required components (done so we make sure the buildrequires
 # match the requires versions of things).
@@ -426,6 +427,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
+* Tue Mar 02 2021 Martin Kolman <mkolman@redhat.com> - 34.24.5-3
+- Choose the best locale more carefully (#1933384) (vponcova)
+
 * Thu Feb 25 2021 Martin Kolman <mkolman@redhat.com> - 34.24.5-2
 - Determine GRUB directory relative path to use in config file (#1928588) (javierm)
 - The network spoke should be visible in live spins (#1932961) (vponcova)