Patches have been adapted for MSVSphere 10.0 build

SOURCES/0001-Disable-subscription.patch

@@ -1,4 +1,4 @@
-From 9c5bf55836e7f308d6ec86d97eb0668c1db91892 Mon Sep 17 00:00:00 2001
+From e003a1bca1a42eebcd92c7c3497a27cac86f399a Mon Sep 17 00:00:00 2001
 From: Eugene Zamriy <eugene@zamriy.info>
 Date: Fri, 14 Apr 2023 12:53:14 +0300
 Subject: [PATCH 01/15] Disable subscription
@@ -8,10 +8,10 @@ Subject: [PATCH 01/15] Disable subscription
  1 file changed, 4 insertions(+)
 
 diff --git a/pyanaconda/ui/gui/spokes/subscription.py b/pyanaconda/ui/gui/spokes/subscription.py
-index e8cf442..5c5db81 100644
+index 16c4af8..860f0d8 100644
 --- a/pyanaconda/ui/gui/spokes/subscription.py
 +++ b/pyanaconda/ui/gui/spokes/subscription.py
-@@ -540,6 +540,10 @@ class SubscriptionSpoke(NormalSpoke):
+@@ -550,6 +550,10 @@ class SubscriptionSpoke(NormalSpoke):
          # also set the spoke warning banner
          self.show_warning_message(error_message)
  

SOURCES/0002-Hide-CDN-source-button.patch

@@ -1,4 +1,4 @@
-From 1b180235392825e31536fe58381c4183228309b6 Mon Sep 17 00:00:00 2001
+From 0ebb7bcf31d1b20a2272297a5e5a6b813efb4a94 Mon Sep 17 00:00:00 2001
 From: Eugene Zamriy <eugene@zamriy.info>
 Date: Fri, 14 Apr 2023 12:54:58 +0300
 Subject: [PATCH 02/15] Hide CDN source button
@@ -8,10 +8,10 @@ Subject: [PATCH 02/15] Hide CDN source button
  1 file changed, 2 insertions(+)
 
 diff --git a/pyanaconda/ui/gui/spokes/installation_source.py b/pyanaconda/ui/gui/spokes/installation_source.py
-index 0c98e17..6fa4475 100644
+index 3c5a76b..56126d5 100644
 --- a/pyanaconda/ui/gui/spokes/installation_source.py
 +++ b/pyanaconda/ui/gui/spokes/installation_source.py
-@@ -353,6 +353,8 @@ class SourceSpoke(NormalSpoke, GUISpokeInputCheckHandler, SourceSwitchHandler):
+@@ -374,6 +374,8 @@ class SourceSpoke(NormalSpoke, GUISpokeInputCheckHandler, SourceSwitchHandler):
          self._network_button = self.builder.get_object("networkRadioButton")
          self._network_box = self.builder.get_object("networkBox")
  

SOURCES/0003-Set-MSVSphere-installer-colors.patch

@@ -1,4 +1,4 @@
-From d9fe80cb2d797a077d604d8f9a69ceaf5167e51b Mon Sep 17 00:00:00 2001
+From 6ca5b7ab8e004cca3f676af557a469fb7546313a Mon Sep 17 00:00:00 2001
 From: Sergey Cherevko <sergey.cherevko@softline.com>
 Date: Thu, 19 Dec 2024 21:13:04 +0300
 Subject: [PATCH 03/15] Set MSVSphere installer colors

SOURCES/0004-Add-Minimal-and-Server-repository-support.patch

@@ -1,4 +1,4 @@
-From 390568b415c06b3c129bbb122f5eb103e88e4080 Mon Sep 17 00:00:00 2001
+From ab4c3f4f0de08135b1cb1c3ab85a710dffc83e5c Mon Sep 17 00:00:00 2001
 From: Sergey Cherevko <s.cherevko@msvsphere-os.ru>
 Date: Thu, 19 Dec 2024 21:19:04 +0300
 Subject: [PATCH 04/15] Add Minimal and Server repository support

SOURCES/0005-Set-default-timezone-to-Europe-Moscow.patch

@@ -1,4 +1,4 @@
-From 028412d2e031a850831d0a521af49051299e1b10 Mon Sep 17 00:00:00 2001
+From c5d4cb2fbbfa22203a61d5d44a0b3a5b041f5bfa Mon Sep 17 00:00:00 2001
 From: Sergey Cherevko <s.cherevko@msvsphere-os.ru>
 Date: Thu, 19 Dec 2024 21:24:09 +0300
 Subject: [PATCH 05/15] Set default timezone to Europe/Moscow

SOURCES/0006-Add-MSVSphere-product-config.patch

@@ -1,7 +1,7 @@
-From 9fb4b8b7e4e6a995da947d93718eb945b8f1bc30 Mon Sep 17 00:00:00 2001
+From 02205a293036ef11c7d58ce3f3f51998560c3727 Mon Sep 17 00:00:00 2001
 From: tigro <tigro@msvsphere-os.ru>
 Date: Tue, 24 Dec 2024 14:45:34 +0300
-Subject: [PATCH] Add MSVSphere product config
+Subject: [PATCH 06/15] Add MSVSphere product config
 
 ---
  data/profile.d/Makefile.am    |  1 +
@@ -65,5 +65,5 @@ index 0000000..6f4ac7e
 +[License]
 +eula = /usr/share/msvsphere-release/EULA
 -- 
-2.47.1
+2.43.5
 

SOURCES/0007-Set-Russian-language-as-default.patch

@@ -1,4 +1,4 @@
-From 5b6dfb604760f76121e6152ed387c4f939ded693 Mon Sep 17 00:00:00 2001
+From 270e69c9fef25d58435b113bbf662100641e59e7 Mon Sep 17 00:00:00 2001
 From: Sergey Cherevko <s.cherevko@msvsphere-os.ru>
 Date: Thu, 19 Dec 2024 21:25:45 +0300
 Subject: [PATCH 07/15] Set Russian language as default

SOURCES/0008-Replace-Fedora-references-and-update-translations.patch

@@ -1,4 +1,4 @@
-From f57f53c0189b96a426ab033b19a8a808d3e1b269 Mon Sep 17 00:00:00 2001
+From d7d5ed2dca17ca02e4441e9a6ad2c23089d16c3d Mon Sep 17 00:00:00 2001
 From: Sergey Cherevko <s.cherevko@msvsphere-os.ru>
 Date: Thu, 19 Dec 2024 21:34:38 +0300
 Subject: [PATCH 08/15] Replace Fedora references and update translations

SOURCES/0009-Set-Russian-as-default-language-for-new-regions.patch

@@ -1,4 +1,4 @@
-From da01c87c5fc2c2d14fc05b0bccbe47f2e8f6f142 Mon Sep 17 00:00:00 2001
+From e72f9008bb38c0b96b05a7ce5e570496a3e9be86 Mon Sep 17 00:00:00 2001
 From: Sergey Cherevko <s.cherevko@msvsphere-os.ru>
 Date: Wed, 4 Oct 2023 17:41:16 +0300
 Subject: [PATCH 09/15] Set Russian as default language for new regions

SOURCES/0010-Set-English-as-fallback-language-for-help.patch

@@ -1,4 +1,4 @@
-From 76b2065edce9b4e3f3b9fab80ce04ad35f096a61 Mon Sep 17 00:00:00 2001
+From bed4b73636712018ab2eaa9ffa02645c838ae999 Mon Sep 17 00:00:00 2001
 From: Sergey Cherevko <s.cherevko@msvsphere-os.ru>
 Date: Thu, 19 Dec 2024 21:38:09 +0300
 Subject: [PATCH 10/15] Set English as fallback language for help

SOURCES/0012-Enable-administrator-by-default.patch

@@ -1,4 +1,4 @@
-From f39bc62bdbf2fe663d53d19454b2c5c4f42b71b5 Mon Sep 17 00:00:00 2001
+From 216182ea31c7415d48bbd515953189f5e0782e14 Mon Sep 17 00:00:00 2001
 From: tigro <tigro@msvsphere-os.ru>
 Date: Wed, 3 Apr 2024 10:12:41 +0300
 Subject: [PATCH 12/15] Enable administrator by default

SOURCES/0013-Set-latarcyrheb-sun16-as-default-font-instead-of-eur.patch

@@ -1,4 +1,4 @@
-From 52378334637cfba5e35a38d1bb0e1476273709d2 Mon Sep 17 00:00:00 2001
+From 558eaed9961825a2b60bdf5840930292e3beb880 Mon Sep 17 00:00:00 2001
 From: Sergey Cherevko <sergey.cherevko@softline.com>
 Date: Fri, 20 Dec 2024 00:19:31 +0300
 Subject: [PATCH 13/15] Set latarcyrheb-sun16 as default font instead of

SOURCES/0014-Implement-show-EULA-before-installation.patch

@@ -1,6 +1,6 @@
-From 3bf1f830f6f816b00cf3b3449cb94df744d9295a Mon Sep 17 00:00:00 2001
+From 00f15fb27e60cdebfc39f0f2813a662af929eeb8 Mon Sep 17 00:00:00 2001
-From: Dmitry Samoylik <Dmitriy.Samoylik@softline.com>
+From: Sergey Cherevko <s.cherevko@msvsphere-os.ru>
-Date: Thu, 26 Sep 2024 16:57:48 +0300
+Date: Wed, 15 Jan 2025 01:26:24 +0300
 Subject: [PATCH 14/15] Implement show EULA before installation
 
 ---
@@ -32,12 +32,12 @@ index 498601b..51d10e9 100644
  
  
 diff --git a/po/ru.po b/po/ru.po
-index 70bd42b..46eaef4 100644
+index b930cf0..021f249 100644
 --- a/po/ru.po
 +++ b/po/ru.po
-@@ -7383,6 +7383,37 @@ msgstr "К системе прикреплено {} подписок"
+@@ -7361,6 +7361,37 @@ msgstr ""
- msgid "{}. {}"
+ "качестве временной системы. Установку можно начать в любое время, нажав на "
- msgstr "{}. {}"
+ "значок установки в разделе Действия."
  
 +msgid "LICENSING"
 +msgstr "ЛИЦЕНЗИРОВАНИЕ"
@@ -70,8 +70,8 @@ index 70bd42b..46eaef4 100644
 +msgid "License Agreement:"
 +msgstr "Лицензионное соглашение:"
 +
- #~ msgid "Btrfs file system is not supported."
+ #~ msgid "1 subscription attached to the system"
- #~ msgstr "Файловая система btrfs не поддерживается."
+ #~ msgstr "1 подписка прикреплена к системе"
  
 diff --git a/pyanaconda/core/configuration/eula.py b/pyanaconda/core/configuration/eula.py
 new file mode 100644
@@ -278,7 +278,7 @@ index 0000000..1d340f0
 +</interface>
 diff --git a/pyanaconda/ui/gui/spokes/eula.py b/pyanaconda/ui/gui/spokes/eula.py
 new file mode 100644
-index 0000000..a487c6b
+index 0000000..37cc4cb
 --- /dev/null
 +++ b/pyanaconda/ui/gui/spokes/eula.py
 @@ -0,0 +1,107 @@
@@ -287,7 +287,7 @@ index 0000000..a487c6b
 +from pyanaconda.ui.common import FirstbootOnlySpokeMixIn
 +from pyanaconda.ui.gui.spokes import NormalSpoke
 +from pyanaconda.core.i18n import _, CN_
-+from pyanaconda.core import eula
++from pyanaconda.core.configuration import eula
 +from pyanaconda.ui.categories.eula import LicensingCategory
 +from pyanaconda.anaconda_loggers import get_module_logger
 +from pykickstart.constants import FIRSTBOOT_RECONFIG
@@ -391,7 +391,7 @@ index 0000000..a487c6b
 +            self._agree_label.set_markup(self._agree_text)
 diff --git a/pyanaconda/ui/tui/spokes/eula.py b/pyanaconda/ui/tui/spokes/eula.py
 new file mode 100644
-index 0000000..a3e8e62
+index 0000000..c8e194b
 --- /dev/null
 +++ b/pyanaconda/ui/tui/spokes/eula.py
 @@ -0,0 +1,128 @@
@@ -403,7 +403,7 @@ index 0000000..a3e8e62
 +from simpleline.render.screen import UIScreen, InputState
 +from simpleline.render.screen_handler import ScreenHandler
 +from pyanaconda.ui.common import FirstbootOnlySpokeMixIn
-+from pyanaconda.core import eula
++from pyanaconda.core.configuration import eula
 +from pyanaconda.ui.categories.eula import LicensingCategory
 +from pyanaconda.core.i18n import _, N_
 +from pykickstart.constants import FIRSTBOOT_RECONFIG

SOURCES/0015-Change-docs-site.patch

@@ -1,4 +1,4 @@
-From 74dacc06bd34591593b34add271f452a07d72b61 Mon Sep 17 00:00:00 2001
+From ece137a3d071e618339eebe35d4d461e710ac7b2 Mon Sep 17 00:00:00 2001
 From: tigro <tigro@msvsphere-os.ru>
 Date: Tue, 22 Oct 2024 17:29:08 +0300
 Subject: [PATCH 15/15] Change docs site

SPECS/anaconda.spec

@@ -1,7 +1,7 @@
 Summary: Graphical system installer
 Name:    anaconda
 Version: 40.22.3.19
-Release: 1%{?dist}.inferit.1
+Release: 1%{?dist}.inferit.2
 License: GPL-2.0-or-later
 URL:     http://fedoraproject.org/wiki/Anaconda
 
@@ -11,7 +11,6 @@ URL:     http://fedoraproject.org/wiki/Anaconda
 # ./autogen.sh
 # make dist
 Source0: https://github.com/rhinstaller/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
-Source1: anaconda-ru.po
 # MSVSphere patches
 Patch1001: 0001-Disable-subscription.patch
 Patch1002: 0002-Hide-CDN-source-button.patch
@@ -26,6 +25,7 @@ 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-Set-latarcyrheb-sun16-as-default-font-instead-of-eur.patch
+Patch1014: 0014-Implement-show-EULA-before-installation.patch
 Patch1015: 0015-Change-docs-site.patch
 
 # Versions of required components (done so we make sure the buildrequires
@@ -361,7 +361,6 @@ runtime on NFS/HTTP/FTP servers or local disks.
 
 %prep
 %setup -q
-cp %{SOURCE1} po/ru.po
 %autopatch -p1
 # de-branding
 sed -e 's/RHEL/MSVSphere/g' -i po/*.po
@@ -377,6 +376,10 @@ sed -i 's@rhel-smt@knowledge-base/security/smt.html@g;s@red.ht@docs.msvsphere-os
 
 %install
 %{make_install}
+msgfmt  --statistics --verbose -o po/ru.mo po/ru.po
+rm -fv %{buildroot}%{_datadir}/locale/ru/LC_MESSAGES/anaconda.mo
+install -m 644 -p po/ru.mo %{buildroot}%{_datadir}/locale/ru/LC_MESSAGES/anaconda.mo
+
 find %{buildroot} -type f -name "*.la" | xargs %{__rm}
 
 # Create an empty directory for addons
@@ -500,6 +503,9 @@ rm -rf \
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
+* Wed Jan 15 2025 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 40.22.3.19-1.inferit.2
+- Patches have been adapted for MSVSphere 10.0 build
+
 * Tue Dec 24 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 40.22.3.19-1.inferit.1
 - Drop EULA patch