Fixed MSVSphere de-branding and identity support errors.

i9-beta changed/i9-beta/anaconda-34.25.3.8-1.el9.inferit.2
Sergey Cherevko 1 year ago
parent 9c136a62b2
commit dbfe9f3145
Signed by: scherevko
GPG Key ID: D87CBBC16D2E4A72

@ -1,6 +1,6 @@
From 0e230bce8edec21c1121bba9ddacfd1f4464c1da Mon Sep 17 00:00:00 2001 From 50f3a9ddbfe912dc6c2045b90bdbf952a3672da4 Mon Sep 17 00:00:00 2001
From: Sergey Cherevko <s.cherevko@msvsphere-os.ru> From: Sergey Cherevko <s.cherevko@msvsphere-os.ru>
Date: Wed, 4 Oct 2023 18:22:15 +0300 Date: Mon, 23 Oct 2023 09:51:56 +0300
Subject: [PATCH 11/13] Add MSVSphere identification support Subject: [PATCH 11/13] Add MSVSphere identification support
--- ---
@ -8,11 +8,11 @@ Subject: [PATCH 11/13] Add MSVSphere identification support
data/liveinst/gnome/fedora-welcome.js | 2 +- data/liveinst/gnome/fedora-welcome.js | 2 +-
po/ru.po | 184 +++++++++++++++--- po/ru.po | 184 +++++++++++++++---
pyanaconda/product.py | 36 +++- pyanaconda/product.py | 36 +++-
.../ui/gui/spokes/installation_progress.py | 6 +- .../ui/gui/spokes/installation_progress.py | 8 +-
.../ui/gui/spokes/lib/storage_dialogs.py | 4 +- .../ui/gui/spokes/lib/storage_dialogs.py | 4 +-
pyanaconda/ui/gui/spokes/welcome.py | 21 +- pyanaconda/ui/gui/spokes/welcome.py | 21 +-
pyanaconda/vnc.py | 42 +++- pyanaconda/vnc.py | 42 +++-
8 files changed, 253 insertions(+), 46 deletions(-) 8 files changed, 254 insertions(+), 47 deletions(-)
diff --git a/data/liveinst/gnome/fedora-welcome.desktop b/data/liveinst/gnome/fedora-welcome.desktop diff --git a/data/liveinst/gnome/fedora-welcome.desktop b/data/liveinst/gnome/fedora-welcome.desktop
index 90f5678..abbbff3 100644 index 90f5678..abbbff3 100644
@ -411,7 +411,7 @@ index 9dbfe1f..4feea0a 100644
"productVersion": productVersion.upper() "productVersion": productVersion.upper()
} }
diff --git a/pyanaconda/ui/gui/spokes/installation_progress.py b/pyanaconda/ui/gui/spokes/installation_progress.py diff --git a/pyanaconda/ui/gui/spokes/installation_progress.py b/pyanaconda/ui/gui/spokes/installation_progress.py
index c2dfbaf..560e2af 100644 index c2dfbaf..de1fe76 100644
--- a/pyanaconda/ui/gui/spokes/installation_progress.py --- a/pyanaconda/ui/gui/spokes/installation_progress.py
+++ b/pyanaconda/ui/gui/spokes/installation_progress.py +++ b/pyanaconda/ui/gui/spokes/installation_progress.py
@@ -155,14 +155,14 @@ class ProgressSpoke(StandaloneSpoke): @@ -155,14 +155,14 @@ class ProgressSpoke(StandaloneSpoke):
@ -421,7 +421,8 @@ index c2dfbaf..560e2af 100644
- "%s is now successfully installed and ready for you to use!\n" - "%s is now successfully installed and ready for you to use!\n"
+ "%(name)s is now successfully installed and ready for you to use!\n" + "%(name)s is now successfully installed and ready for you to use!\n"
"Go ahead and reboot your system to start using it!" "Go ahead and reboot your system to start using it!"
) % productName - ) % productName
+ ) % {"name": productName}
else: else:
continue_text = _( continue_text = _(
- "%s is now successfully installed and ready for you to use!\n" - "%s is now successfully installed and ready for you to use!\n"
@ -549,5 +550,5 @@ index 5fadcde..c349de8 100644
'productVersion': product.productVersion, 'productVersion': product.productVersion,
'name': host} 'name': host}
-- --
2.41.0 2.39.3

@ -1,7 +1,7 @@
Summary: Graphical system installer Summary: Graphical system installer
Name: anaconda Name: anaconda
Version: 34.25.3.8 Version: 34.25.3.8
Release: 1%{?dist}.inferit.1 Release: 1%{?dist}.inferit.2
License: GPLv2+ and MIT License: GPLv2+ and MIT
URL: http://fedoraproject.org/wiki/Anaconda URL: http://fedoraproject.org/wiki/Anaconda
@ -316,6 +316,11 @@ runtime on NFS/HTTP/FTP servers or local disks.
%prep %prep
%autosetup -p 1 %autosetup -p 1
# de-branding
sed -e 's/RHEL/MSVSphere/g' -i po/*.po
sed -e 's/Fedora/MSVSphere/g' -i po/*.po
sed -e 's/Red Hat Enterprise Linux/MSVSphere/g' -i po/*.po
%build %build
# use actual build-time release number, not tarball creation time release number # use actual build-time release number, not tarball creation time release number
%configure ANACONDA_RELEASE=%{release} %configure ANACONDA_RELEASE=%{release}
@ -424,6 +429,10 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
%{_prefix}/libexec/anaconda/dd_* %{_prefix}/libexec/anaconda/dd_*
%changelog %changelog
* Mon Oct 23 2023 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 34.25.3.8-1.inferit.2
- Fixed MSVSphere de-branding and identity support errors.
- Rebuilt for MSVSphere 8.8
* Sun Oct 22 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.25.3.8-1.inferit.1 * Sun Oct 22 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.25.3.8-1.inferit.1
- Drop R: libreport-rhel-anaconda-bugzilla - Drop R: libreport-rhel-anaconda-bugzilla

Loading…
Cancel
Save