From f514b9cc8a31c0a7081bae3a59b939bfa6294038 Mon Sep 17 00:00:00 2001 From: tigro Date: Sat, 14 Sep 2024 21:31:38 +0300 Subject: [PATCH] Added Certified Flavour --- ...Add-MSVSphere-identification-support.patch | 161 +++++++++++------- SPECS/anaconda.spec | 5 +- 2 files changed, 101 insertions(+), 65 deletions(-) diff --git a/SOURCES/0011-Add-MSVSphere-identification-support.patch b/SOURCES/0011-Add-MSVSphere-identification-support.patch index c029dcd..1a58492 100644 --- a/SOURCES/0011-Add-MSVSphere-identification-support.patch +++ b/SOURCES/0011-Add-MSVSphere-identification-support.patch @@ -1,19 +1,19 @@ -From b0fe2c954cbab7d9e963a71efa6be2e9b310ab3d Mon Sep 17 00:00:00 2001 +From ddec23a420f03e2519bba9b0aba24b401ee0c409 Mon Sep 17 00:00:00 2001 From: tigro Date: Wed, 3 Apr 2024 10:11:15 +0300 -Subject: [PATCH] Add MSVSphere identification support +Subject: [PATCH 11/11] Add MSVSphere identification support --- data/liveinst/gnome/fedora-welcome.desktop | 4 +- data/liveinst/gnome/fedora-welcome.js | 2 +- - po/ru.po | 216 ++++++++++++++---- - pyanaconda/product.py | 36 ++- + po/ru.po | 238 ++++++++++++++---- + pyanaconda/product.py | 40 ++- .../ui/gui/spokes/installation_progress.py | 8 +- pyanaconda/ui/gui/spokes/lib/accordion.py | 2 +- .../ui/gui/spokes/lib/storage_dialogs.py | 4 +- - pyanaconda/ui/gui/spokes/welcome.py | 21 +- - pyanaconda/vnc.py | 42 +++- - 9 files changed, 273 insertions(+), 62 deletions(-) + pyanaconda/ui/gui/spokes/welcome.py | 23 +- + pyanaconda/vnc.py | 47 +++- + 9 files changed, 305 insertions(+), 63 deletions(-) diff --git a/data/liveinst/gnome/fedora-welcome.desktop b/data/liveinst/gnome/fedora-welcome.desktop index 90f5678..8ca72a7 100644 @@ -29,7 +29,7 @@ index 90f5678..8ca72a7 100644 Terminal=false Type=Application diff --git a/data/liveinst/gnome/fedora-welcome.js b/data/liveinst/gnome/fedora-welcome.js -index 4c0a66a..e313403 100755 +index 4c0a66a..0a494c8 100755 --- a/data/liveinst/gnome/fedora-welcome.js +++ b/data/liveinst/gnome/fedora-welcome.js @@ -62,7 +62,7 @@ const WelcomeWindow = new Lang.Class({ @@ -42,10 +42,10 @@ index 4c0a66a..e313403 100755 this.window.connect('key-press-event', Lang.bind(this, function(w, event) { diff --git a/po/ru.po b/po/ru.po -index 1edb03d..1f8915b 100644 +index 1edb03d..4742180 100644 --- a/po/ru.po +++ b/po/ru.po -@@ -197,7 +197,37 @@ msgstr "Выбор корня" +@@ -197,7 +197,42 @@ msgstr "Выбор корня" msgid "The following installations were discovered on your system." msgstr "В вашей системе обнаружены следующие установки." @@ -57,34 +57,39 @@ index 1edb03d..1f8915b 100644 + +#: pyanaconda/product.py:85 +#, python-format ++msgid "MSVSphere %(productVersion)s Certified INSTALLATION" ++msgstr "УСТАНОВКА МСВСфера %(productVersion)s Сертифицированная" ++ ++#: pyanaconda/product.py:87 ++#, python-format +msgid "MSVSphere %(productVersion)s ARM INSTALLATION" +msgstr "УСТАНОВКА МСВСфера %(productVersion)s АРМ" + -+#: pyanaconda/product.py:87 ++#: pyanaconda/product.py:89 +#, python-format +msgid "MSVSphere %(productVersion)s Cinnamon INSTALLATION" +msgstr "УСТАНОВКА МСВСфера %(productVersion)s Cinnamon" + -+#: pyanaconda/product.py:89 ++#: pyanaconda/product.py:91 +#, python-format +msgid "MSVSphere %(productVersion)s KDE INSTALLATION" +msgstr "УСТАНОВКА МСВСфера %(productVersion)s KDE" + -+#: pyanaconda/product.py:91 ++#: pyanaconda/product.py:93 +#, python-format +msgid "MSVSphere %(productVersion)s XFCE INSTALLATION" +msgstr "УСТАНОВКА МСВСфера %(productVersion)s XFCE" + -+#: pyanaconda/product.py:93 ++#: pyanaconda/product.py:95 +#, python-format +msgid "MSVSphere %(productVersion)s OS INSTALLATION" +msgstr "УСТАНОВКА МСВСфера %(productVersion)s ОС" + -+#: pyanaconda/product.py:95 ++#: pyanaconda/product.py:97 #, python-format msgid "%(productName)s %(productVersion)s INSTALLATION" msgstr "УСТАНОВКА %(productName)s %(productVersion)s" -@@ -288,31 +318,91 @@ msgstr "Сервера NTP:" +@@ -288,31 +323,101 @@ msgstr "Сервера NTP:" msgid "not configured" msgstr "не настроено" @@ -96,66 +101,76 @@ index 1edb03d..1f8915b 100644 + +#: pyanaconda/vnc.py:83 +#, python-format ++msgid "MSVSphere %(productVersion)s Certified installation" ++msgstr "Установка МСВСфера %(productVersion)s Сертифицированная" ++ ++#: pyanaconda/vnc.py:85 ++#, python-format +msgid "MSVSphere %(productVersion)s ARM installation" +msgstr "Установка МСВСфера %(productVersion)s АРМ" + -+#: pyanaconda/vnc.py:85 ++#: pyanaconda/vnc.py:87 +#, python-format +msgid "MSVSphere %(productVersion)s Cinnamon installation" +msgstr "Установка МСВСфера %(productVersion)s Cinnamon" + -+#: pyanaconda/vnc.py:87 ++#: pyanaconda/vnc.py:89 +#, python-format +msgid "MSVSphere %(productVersion)s KDE installation" +msgstr "Установка МСВСфера %(productVersion)s KDE" + -+#: pyanaconda/vnc.py:89 ++#: pyanaconda/vnc.py:91 +#, python-format +msgid "MSVSphere %(productVersion)s XFCE installation" +msgstr "Установка МСВСфера %(productVersion)s XFCE" + -+#: pyanaconda/vnc.py:91 ++#: pyanaconda/vnc.py:93 +#, python-format +msgid "MSVSphere %(productVersion)s OS installation" +msgstr "Установка МСВСфера %(productVersion)s ОС" + -+#: pyanaconda/vnc.py:93 ++#: pyanaconda/vnc.py:95 #, python-format msgid "%(productName)s %(productVersion)s installation" msgstr "Установка %(productName)s %(productVersion)s" -#: pyanaconda/vnc.py:148 -+#: pyanaconda/vnc.py:159 ++#: pyanaconda/vnc.py:167 +#, python-format +msgid "MSVSphere %(productVersion)s Server installation on host %(name)s" +msgstr "Установка МСВСфера %(productVersion)s Сервер на %(name)s" + -+#: pyanaconda/vnc.py:162 ++#: pyanaconda/vnc.py:170 ++#, python-format ++msgid "MSVSphere %(productVersion)s Certified installation on host %(name)s" ++msgstr "Установка МСВСфера %(productVersion)s Сертифицированная на %(name)s" ++ ++#: pyanaconda/vnc.py:173 +#, python-format +msgid "MSVSphere %(productVersion)s ARM installation on host %(name)s" +msgstr "Установка МСВСфера %(productVersion)s АРМ на %(name)s" + -+#: pyanaconda/vnc.py:162 ++#: pyanaconda/vnc.py:176 +#, python-format +msgid "MSVSphere %(productVersion)s Cinnamon installation on host %(name)s" +msgstr "Установка МСВСфера %(productVersion)s Cinnamon на %(name)s" + -+#: pyanaconda/vnc.py:162 ++#: pyanaconda/vnc.py:179 +#, python-format +msgid "MSVSphere %(productVersion)s KDE installation on host %(name)s" +msgstr "Установка МСВСфера %(productVersion)s KDE на %(name)s" + -+#: pyanaconda/vnc.py:162 ++#: pyanaconda/vnc.py:182 +#, python-format +msgid "MSVSphere %(productVersion)s XFCE installation on host %(name)s" +msgstr "Установка МСВСфера %(productVersion)s XFCE на %(name)s" + -+#: pyanaconda/vnc.py:165 ++#: pyanaconda/vnc.py:185 +#, python-format +msgid "MSVSphere %(productVersion)s OS installation on host %(name)s" +msgstr "Установка МСВСфера %(productVersion)s ОС на %(name)s" + -+#: pyanaconda/vnc.py:168 ++#: pyanaconda/vnc.py:188 #, python-format msgid "%(productName)s %(productVersion)s installation on host %(name)s" msgstr "Установка %(productName)s %(productVersion)s на %(name)s" @@ -182,7 +197,7 @@ index 1edb03d..1f8915b 100644 #, python-format msgid "Giving up attempting to connect after %d try!\n" msgid_plural "Giving up attempting to connect after %d tries!\n" -@@ -320,16 +410,16 @@ msgstr[0] "Установка соединения прекращена посл +@@ -320,16 +425,16 @@ msgstr[0] "Установка соединения прекращена посл msgstr[1] "Установка соединения прекращена после %d попыток!\n" msgstr[2] "Установка соединения прекращена после %d попыток!\n" @@ -202,7 +217,7 @@ index 1edb03d..1f8915b 100644 #, python-format msgid "" "Please manually connect your vnc client to IP-ADDRESS:%s to begin the " -@@ -340,15 +430,15 @@ msgstr "" +@@ -340,15 +445,15 @@ msgstr "" "Переключитесь на оболочку (Ctrl-B 2) и выполните команду 'ip addr', чтобы " "найти IP-ADDRESS." @@ -221,7 +236,7 @@ index 1edb03d..1f8915b 100644 msgid "" "\n" "\n" -@@ -366,7 +456,7 @@ msgstr "" +@@ -366,7 +471,7 @@ msgstr "" "\n" "\n" @@ -230,7 +245,7 @@ index 1edb03d..1f8915b 100644 msgid "" "\n" "\n" -@@ -382,7 +472,7 @@ msgstr "" +@@ -382,7 +487,7 @@ msgstr "" "для ограничения доступа к серверу.\n" "\n" @@ -239,7 +254,7 @@ index 1edb03d..1f8915b 100644 msgid "" "\n" "\n" -@@ -394,7 +484,7 @@ msgstr "" +@@ -394,7 +499,7 @@ msgstr "" "Вы выбрали запуск VNC с паролем.\n" "\n" @@ -248,7 +263,7 @@ index 1edb03d..1f8915b 100644 msgid "" "\n" "\n" -@@ -406,7 +496,7 @@ msgstr "" +@@ -406,7 +511,7 @@ msgstr "" "Неизвестная ошибка. Остановка работы.\n" "\n" @@ -257,7 +272,7 @@ index 1edb03d..1f8915b 100644 msgid "" "VNC password must be six to eight characters long.\n" "Please enter a new one, or leave blank for no password." -@@ -750,13 +840,13 @@ msgstr "" +@@ -750,13 +855,13 @@ msgstr "" #: pyanaconda/core/constants.py:157 msgid "" @@ -277,7 +292,7 @@ index 1edb03d..1f8915b 100644 #: pyanaconda/core/constants.py:163 msgid "" -@@ -1507,7 +1597,7 @@ msgstr "Не удалось добавить устройство." +@@ -1507,7 +1612,7 @@ msgstr "Не удалось добавить устройство." #: pyanaconda/modules/storage/partitioning/interactive/utils.py:213 #, python-brace-format msgid "New {name} {version} Installation" @@ -286,7 +301,7 @@ index 1edb03d..1f8915b 100644 #: pyanaconda/modules/storage/partitioning/interactive/utils.py:275 msgid "Cannot set label on file system." -@@ -1937,7 +2027,7 @@ msgid "" +@@ -1937,7 +2042,7 @@ msgid "" "recommended for a normal %(productName)s install." msgstr "" "Размер раздела %(mount)s меньше %(size)s, что меньше рекомендованного " @@ -295,7 +310,7 @@ index 1edb03d..1f8915b 100644 #: pyanaconda/modules/storage/checker/utils.py:131 #, python-format -@@ -3455,7 +3545,7 @@ msgid "" +@@ -3455,7 +3560,7 @@ msgid "" "You haven't created any mount points for your %(product)s %(version)s " "installation yet. You can:" msgstr "" @@ -304,7 +319,7 @@ index 1edb03d..1f8915b 100644 "Вы можете:" #: pyanaconda/ui/gui/spokes/lib/accordion.py:479 -@@ -3487,6 +3577,10 @@ msgstr "" +@@ -3487,6 +3592,10 @@ msgstr "" "_Автоматически созданные точки монтирования могут быть зашифрованы по " "умолчанию:" @@ -315,7 +330,7 @@ index 1edb03d..1f8915b 100644 #: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:69 msgid "Please wait... software metadata still loading." msgstr "Подождите… Всё ещё загружаются метаданные ПО." -@@ -3498,7 +3592,7 @@ msgid "" +@@ -3498,7 +3607,7 @@ msgid "" "of available space, including %(software)s for software and " "%(swap)s for swap space." msgstr "" @@ -324,7 +339,7 @@ index 1edb03d..1f8915b 100644 "%(software)s для программ и %(swap)s для подкачки." #: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:81 -@@ -3509,7 +3603,7 @@ msgid "" +@@ -3509,7 +3618,7 @@ msgid "" "%(software)s for software and %(swap)s for swap space." msgstr "" "Для программного обеспечения " @@ -333,7 +348,7 @@ index 1edb03d..1f8915b 100644 "%(software)s для программ и %(swap)s для подкачки." #: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:132 -@@ -3520,11 +3614,11 @@ msgstr "%s На выбранных дисках доступно:" +@@ -3520,11 +3629,11 @@ msgstr "%s На выбранных дисках доступно:" #: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:142 #, python-format msgid "" @@ -347,7 +362,7 @@ index 1edb03d..1f8915b 100644 "существующие разделы с помощью помощника или самостоятельно выбрать размеры " "разделов в окне настройки разделов." -@@ -3534,7 +3628,7 @@ msgid "" +@@ -3534,7 +3643,7 @@ msgid "" " You don't have enough space available to install %(product)s, even " "if you used all of the free space available on the selected disks." msgstr "" @@ -356,7 +371,7 @@ index 1edb03d..1f8915b 100644 "использовать все свободное место на выбранных дисках." #: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:178 -@@ -3545,10 +3639,10 @@ msgid "" +@@ -3545,10 +3654,10 @@ msgid "" "could add more disks for additional space, modify your software selection to " "install a smaller version of %(productName)s, or quit the installer." msgstr "" @@ -369,7 +384,7 @@ index 1edb03d..1f8915b 100644 "покинуть программу установки." #: pyanaconda/ui/gui/spokes/lib/subscription.py:66 -@@ -4096,7 +4190,7 @@ msgid "" +@@ -4096,7 +4205,7 @@ msgid "" "you'll be able to view their details here." msgstr "" "Здесь будет показана информация о созданных точках монтирования для " @@ -378,44 +393,51 @@ index 1edb03d..1f8915b 100644 #: pyanaconda/ui/gui/spokes/custom_storage.py:615 #: pyanaconda/ui/gui/spokes/advstorage/nvdimm.glade:178 -@@ -4431,6 +4525,36 @@ msgstr "Рабочий сервер NTP не настроен" +@@ -4431,7 +4540,42 @@ msgstr "Рабочий сервер NTP не настроен" msgid "What language would you like to use during the installation process?" msgstr "Какой язык вы хотите использовать в процессе установки?" -+#: pyanaconda/ui/gui/spokes/welcome.py:278 +-#: pyanaconda/ui/gui/spokes/welcome.py:209 ++#: pyanaconda/ui/gui/spokes/welcome.py:213 +#, python-format +msgid "WELCOME TO MSVSphere %(version)s Server" +msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s Сервер" + -+#: pyanaconda/ui/gui/spokes/welcome.py:280 ++#: pyanaconda/ui/gui/spokes/welcome.py:215 ++#, python-format ++msgid "WELCOME TO MSVSphere %(version)s Certified" ++msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s Сертифицированная" ++ ++#: pyanaconda/ui/gui/spokes/welcome.py:217 +#, python-format +msgid "WELCOME TO MSVSphere %(version)s ARM" +msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s АРМ" + -+#: pyanaconda/ui/gui/spokes/welcome.py:282 ++#: pyanaconda/ui/gui/spokes/welcome.py:219 +#, python-format +msgid "WELCOME TO MSVSphere %(version)s Cinnamon" +msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s Cinnamon" + -+#: pyanaconda/ui/gui/spokes/welcome.py:284 ++#: pyanaconda/ui/gui/spokes/welcome.py:221 +#, python-format +msgid "WELCOME TO MSVSphere %(version)s KDE" +msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s KDE" + -+#: pyanaconda/ui/gui/spokes/welcome.py:286 ++#: pyanaconda/ui/gui/spokes/welcome.py:223 +#, python-format +msgid "WELCOME TO MSVSphere %(version)s XFCE" +msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s XFCE" + -+#: pyanaconda/ui/gui/spokes/welcome.py:288 ++#: pyanaconda/ui/gui/spokes/welcome.py:225 +#, python-format +msgid "WELCOME TO MSVSphere %(version)s OS" +msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s ОС" + - #: pyanaconda/ui/gui/spokes/welcome.py:209 ++#: pyanaconda/ui/gui/spokes/welcome.py:227 #, python-format msgid "WELCOME TO %(name)s %(version)s." -@@ -4482,8 +4606,8 @@ msgid "" + msgstr "ДОБРО ПОЖАЛОВАТЬ В %(name)s %(version)s." +@@ -4482,8 +4626,8 @@ msgid "" "%s is now successfully installed and ready for you to use!\n" "Go ahead and reboot your system to start using it!" msgstr "" @@ -426,7 +448,7 @@ index 1edb03d..1f8915b 100644 #: pyanaconda/ui/gui/spokes/installation_progress.py:163 #, python-format -@@ -4491,8 +4615,8 @@ msgid "" +@@ -4491,8 +4635,8 @@ msgid "" "%s is now successfully installed and ready for you to use!\n" "Go ahead and quit the application to start using it!" msgstr "" @@ -437,7 +459,7 @@ index 1edb03d..1f8915b 100644 #: pyanaconda/ui/gui/spokes/installation_source.py:73 msgid "Setting up installation source..." -@@ -7614,21 +7738,21 @@ msgstr "Настройка Liveinst" +@@ -7614,21 +7758,21 @@ msgstr "Настройка Liveinst" #: data/liveinst/gnome/fedora-welcome.desktop:3 #: data/liveinst/gnome/fedora-welcome.js:65 @@ -468,7 +490,7 @@ index 1edb03d..1f8915b 100644 #: data/liveinst/gnome/fedora-welcome.js:130 diff --git a/pyanaconda/product.py b/pyanaconda/product.py -index 9dbfe1f..140dbee 100644 +index 9dbfe1f..3a9998c 100644 --- a/pyanaconda/product.py +++ b/pyanaconda/product.py @@ -19,6 +19,7 @@ @@ -479,7 +501,7 @@ index 9dbfe1f..140dbee 100644 from pyanaconda.core.i18n import _ -@@ -64,9 +65,42 @@ def trim_product_version_for_ui(version): +@@ -64,9 +65,46 @@ def trim_product_version_for_ui(version): productVersion = trim_product_version_for_ui(productVersion) @@ -488,6 +510,8 @@ index 9dbfe1f..140dbee 100644 + if productName == "MSVSphere Server" or \ + (productName == "MSVSphere" and productVariant == "Minimal"): + productFlavor = "Server" ++ elif productName == "MSVSphere" and productVariant == "Certified": ++ productFlavor = "Certified" + elif productName == "MSVSphere" and productVariant == "BaseOS": + productFlavor = "OS" + elif productName == "MSVSphere": @@ -507,6 +531,8 @@ index 9dbfe1f..140dbee 100644 - return _("%(productName)s %(productVersion)s INSTALLATION") % { + if productBase == "MSVSphere" and productFlavor == "Server": + distro_text = _("MSVSphere %(productVersion)s Server INSTALLATION") ++ elif productBase == "MSVSphere" and productFlavor == "Certified": ++ distro_text = _("MSVSphere %(productVersion)s Certified INSTALLATION") + elif productBase == "MSVSphere" and productFlavor == "ARM": + distro_text = _("MSVSphere %(productVersion)s ARM INSTALLATION") + elif productBase == "MSVSphere" and productFlavor == "Cinnamon": @@ -577,7 +603,7 @@ index 2f8338b..e330641 100644 self._add_modify_watcher(label) diff --git a/pyanaconda/ui/gui/spokes/welcome.py b/pyanaconda/ui/gui/spokes/welcome.py -index de71615..7937f2c 100644 +index de71615..a0718bb 100644 --- a/pyanaconda/ui/gui/spokes/welcome.py +++ b/pyanaconda/ui/gui/spokes/welcome.py @@ -35,7 +35,10 @@ from pyanaconda.ui.gui.spokes.lib.lang_locale_handler import LangLocaleHandler @@ -592,13 +618,15 @@ index de71615..7937f2c 100644 from pyanaconda import flags from pyanaconda.core.i18n import _ from pyanaconda.core.util import ipmi_abort -@@ -206,7 +209,21 @@ class WelcomeLanguageSpoke(StandaloneSpoke, LangLocaleHandler): +@@ -206,7 +209,23 @@ class WelcomeLanguageSpoke(StandaloneSpoke, LangLocaleHandler): # The welcome label is special - it has text that needs to be substituted. welcomeLabel = self.builder.get_object("welcomeLabel") - welcomeLabel.set_text(_("WELCOME TO %(name)s %(version)s.") % + if productBase == "MSVSphere" and productFlavor == "Server": + welcome_text = _("WELCOME TO MSVSphere %(version)s Server") ++ elif productBase == "MSVSphere" and productFlavor == "Certified": ++ welcome_text = _("WELCOME TO MSVSphere %(version)s Certified") + elif productBase == "MSVSphere" and productFlavor == "ARM": + welcome_text = _("WELCOME TO MSVSphere %(version)s ARM") + elif productBase == "MSVSphere" and productFlavor == "Cinnamon": @@ -616,10 +644,10 @@ index de71615..7937f2c 100644 # Retranslate the language (filtering) entry's placeholder text diff --git a/pyanaconda/vnc.py b/pyanaconda/vnc.py -index 5fadcde..c349de8 100644 +index 5fadcde..0d0e3b7 100644 --- a/pyanaconda/vnc.py +++ b/pyanaconda/vnc.py -@@ -76,7 +76,22 @@ class VncServer(object): +@@ -76,7 +76,24 @@ class VncServer(object): self.anaconda = None self.log = get_stdout_logger() @@ -627,6 +655,8 @@ index 5fadcde..c349de8 100644 + is_sphere = product.productBase == "MSVSphere" + if is_sphere and product.productFlavor == "Server": + desktop_text = _("MSVSphere %(productVersion)s Server installation") ++ elif is_sphere and product.productFlavor == "Certified": ++ desktop_text = _("MSVSphere %(productVersion)s Certified installation") + elif is_sphere and product.productFlavor == "ARM": + desktop_text = _("MSVSphere %(productVersion)s ARM installation") + elif is_sphere and product.productFlavor == "Cinnamon": @@ -643,7 +673,7 @@ index 5fadcde..c349de8 100644 % {'productName': product.productName, 'productVersion': product.productVersion} -@@ -145,8 +160,29 @@ class VncServer(object): +@@ -145,8 +162,32 @@ class VncServer(object): # figure out product info if host: @@ -653,6 +683,9 @@ index 5fadcde..c349de8 100644 + if is_sphere and product.productFlavor == "Server": + desktop_text = _("MSVSphere %(productVersion)s Server " + "installation on host %(name)s") ++ elif is_sphere and product.productFlavor == "Certified": ++ desktop_text = _("MSVSphere %(productVersion)s Certified " ++ "installation on host %(name)s") + elif is_sphere and product.productFlavor == "ARM": + desktop_text = _("MSVSphere %(productVersion)s ARM " + "installation on host %(name)s") @@ -676,5 +709,5 @@ index 5fadcde..c349de8 100644 'productVersion': product.productVersion, 'name': host} -- -2.44.0 +2.46.0 diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec index ce77460..d2a387f 100644 --- a/SPECS/anaconda.spec +++ b/SPECS/anaconda.spec @@ -1,7 +1,7 @@ Summary: Graphical system installer Name: anaconda Version: 34.25.4.9 -Release: 1%{?dist}.inferit.100.certified +Release: 1%{?dist}.inferit.101.certified License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -441,6 +441,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d %{_prefix}/libexec/anaconda/dd_* %changelog +* Sat Sep 14 2024 Arkady L. Shane - 34.25.4.9-1.inferit.101.certified +- Added Certified Flavour + * Fri Sep 13 2024 Arkady L. Shane - 34.25.4.9-1.inferit.100.certified - Bump release