- Update to 34.25.5.9

- Drop obsoletes urls fixes
- Added Certified Flavour
- Implement show EULA before installation
- Place eula files only in live package to avoid license dupes in initial-setup
- Bump release

.anaconda.metadata

@@ -1 +1 @@
-71620d2ed3ce54558da0cb8d49cac48fa89d3a7a SOURCES/anaconda-34.25.4.9.tar.bz2
+2682a25a2e322c227f24375efd8c40254f2fa740  SOURCES/anaconda-34.25.5.9.tar.bz2

.gitignore

@@ -1 +1 @@
-SOURCES/anaconda-34.25.4.9.tar.bz2
+SOURCES/anaconda-34.25.5.9.tar.bz2

SOURCES/0015-Disable-sphere-url.patch

@@ -1,98 +0,0 @@
-From 667ff8db6e0a78ee05cf41b768da8ec8fbc23858 Mon Sep 17 00:00:00 2001
-From: tigro <tigro@msvsphere-os.ru>
-Date: Mon, 25 Dec 2023 14:51:32 +0300
-Subject: [PATCH 15/15] Drop sphere url
-
----
- po/ru.po                     | 16 ++++++++--------
- pyanaconda/core/constants.py |  6 +++---
- 2 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/po/ru.po b/po/ru.po
-index f9ad24e..4619491 100644
---- a/po/ru.po
-+++ b/po/ru.po
-@@ -463,11 +463,11 @@ msgstr ""
- msgid ""
- "This hardware (or a combination thereof) is not supported by MSVSphere. "
- "For more information on supported hardware, please refer to "
--"https://msvsphere-os.ru."
-+"documentation."
- msgstr ""
- "Это аппаратное обеспечение (или их комбинация) не поддерживается "
- "операционной системой. Для получения дополнительной информации о поддерживаемом "
--"оборудовании см. https://msvsphere-os.ru."
-+"оборудовании см. документацию."
- 
- #: pyanaconda/core/constants.py:163
- msgid ""
-@@ -486,29 +486,29 @@ msgid ""
- "Simultaneous Multithreading (SMT) technology can provide performance "
- "improvements for certain workloads, but introduces several publicly "
- "disclosed security issues. You have the option of disabling SMT, which may "
--"impact performance. If you choose to leave SMT enabled, please read https://"
--"docs.msvsphere-os.ru/knowledge-base/security/smt.html to understand your potential risks and learn about other "
-+"impact performance. If you choose to leave SMT enabled, please read "
-+"documentation to understand your potential risks and learn about other "
- "ways to mitigate these risks."
- msgstr ""
- "Технология одновременной многопоточности (SMT) может обеспечить повышение "
- "производительности при определенных рабочих нагрузках, но привносит "
- "несколько известных проблем безопасности. Вы можете отключить SMT, что может "
- "повлиять на производительность. Если вы решите оставить SMT включенным, "
--"прочитайте https://docs.msvsphere-os.ru/knowledge-base/security/smt.html для понимания потенциальных рисков и "
-+"прочитайте документацию для понимания потенциальных рисков и "
- "чтобы узнать о других способах снижения этих рисков."
- 
- #: pyanaconda/core/constants.py:183
- msgid ""
- "Simultaneous Multithreading (SMT) may improve performance for certain "
- "workloads, but introduces several publicly disclosed security issues. You "
--"can disable SMT, which may impact performance. Please read https://docs.msvsphere-os.ru/"
--"knowledge-base/security/smt.html to understand potential risks and learn about ways to mitigate "
-+"can disable SMT, which may impact performance. Please read "
-+"documentation to understand potential risks and learn about ways to mitigate "
- "these risks."
- msgstr ""
- "Одновременная многопоточность (SMT) может увеличить производительность при "
- "определенных рабочих нагрузках, но привносит несколько известных проблем "
- "безопасности. Можно отключить SMT, что может повлиять на производительность. "
--"Прочитайте https://docs.msvsphere-os.ru/knowledge-base/security/smt.html для понимания потенциальных рисков и "
-+"Прочитайте документацию для понимания потенциальных рисков и "
- "чтобы узнать о способах снижения этих рисков."
- 
- #: pyanaconda/core/constants.py:199
-diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py
-index b00c276..1b6aee3 100644
---- a/pyanaconda/core/constants.py
-+++ b/pyanaconda/core/constants.py
-@@ -161,7 +161,7 @@ WARNING_SUPPORT_REMOVED = N_(
- 
- WARNING_HARDWARE_UNSUPPORTED = N_(
-     "This hardware (or a combination thereof) is not supported by MSVSphere. For more information "
--    "on supported hardware, please refer to https://msvsphere-os.ru."
-+    "on supported hardware, please refer to documentation."
- )
- 
- # Storage messages
-@@ -180,7 +180,7 @@ WARNING_SMT_ENABLED_GUI = N_(
-     "improvements for certain workloads, but introduces several publicly "
-     "disclosed security issues. You have the option of disabling SMT, which "
-     "may impact performance. If you choose to leave SMT enabled, please read "
--    "https://docs.msvsphere-os.ru/knowledge-base/security/smt.html to understand your potential risks and learn "
-+    "documentation to understand your potential risks and learn "
-     "about other ways to mitigate these risks."
- )
- 
-@@ -189,7 +189,7 @@ WARNING_SMT_ENABLED_TUI = N_(
-     "Simultaneous Multithreading (SMT) may improve performance for certain "
-     "workloads, but introduces several publicly disclosed security issues. "
-     "You can disable SMT, which may impact performance. Please read "
--    "https://docs.msvsphere-os.ru/knowledge-base/security/smt.html to understand potential risks and learn about "
-+    "documentation to understand potential risks and learn about "
-     "ways to mitigate these risks."
- )
- 
--- 
-2.43.0
-

SPECS/anaconda.spec

@@ -1,7 +1,7 @@
 Summary: Graphical system installer
 Name:    anaconda
-Version: 34.25.4.9
+Version: 34.25.5.9
-Release: 1%{?dist}.inferit.103.certified
+Release: 1%{?dist}.inferit
 License: GPLv2+ and MIT
 URL:     http://fedoraproject.org/wiki/Anaconda
 
@@ -11,8 +11,6 @@ URL:     http://fedoraproject.org/wiki/Anaconda
 # ./autogen.sh
 # make dist
 Source0: %{name}-%{version}.tar.bz2
-# I am tired because of the strange changes in translations
-Source1: russian-34.25.4.7.po
 
 # MSVSphere patches
 Patch1001: 0001-Disable-subscription.patch
@@ -27,9 +25,7 @@ Patch1009: 0009-Set-Russian-as-default-language-for-new-regions.patch
 Patch1010: 0010-Set-English-as-fallback-language-for-help.patch
 Patch1011: 0011-Add-MSVSphere-identification-support.patch
 Patch1012: 0012-Enable-administrator-by-default.patch
-Patch1013: 0013-Fix-smt-url.patch
 Patch1014: 0014-Make-branding-free-Russian-translation.patch
-Patch1015: 0015-Disable-sphere-url.patch
 Patch1016: 0016-Set-LatGrkCyr-8x16-as-default-font-instead-of-eurlat.patch
 Patch1017: 0017-Implement-show-EULA-before-installation.patch
 
@@ -329,12 +325,13 @@ runtime on NFS/HTTP/FTP servers or local disks.
 
 %prep
 %setup -q
-cp %{SOURCE1} po/ru.po
 %autopatch -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
+# Fix SMT url
+sed -i 's@rhel-smt@knowledge-base/security/smt.html@g;s@red.ht@docs.msvsphere-os.ru@g' po/*.po
 
 %build
 # use actual build-time release number, not tarball creation time release number
@@ -455,16 +452,12 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
-* Wed Oct 09 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.25.4.9-1.inferit.103.certified
+* Sat Oct 12 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.25.5.9-1.inferit
-- Place eula files only in live package to avoid license dupes in initial-setup
+- Update to 34.25.5.9
-
+- Drop obsoletes urls fixes
-* Thu Sep 26 2024 Dmitry Samoylik <Dmitriy.Samoylik@softline.com>  - 34.25.4.9-1.inferit.102.certified
-- Implement show EULA before installation
-
-* Sat Sep 14 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.25.4.9-1.inferit.101.certified
 - Added Certified Flavour
-
+- Implement show EULA before installation
-* Fri Sep 13 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.25.4.9-1.inferit.100.certified
+- Place eula files only in live package to avoid license dupes in initial-setup
 - Bump release
 
 * Fri Sep 13 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.25.4.9-1.inferit.2