.gitignore

@@ -1 +1 @@
-SOURCES/lorax-34.9.26.tar.gz
+SOURCES/lorax-34.9.25.tar.gz

.lorax.metadata

@@ -1 +1 @@
-d0dcdb64f67e0835d8dfb1bfe76da510e7df5579 SOURCES/lorax-34.9.26.tar.gz
+74825395b6b0dcf238f14685112bf0eb9894aee7 SOURCES/lorax-34.9.25.tar.gz

SOURCES/0001-Our-isolinux.cfg-is-in-cp866-encoding.patch

@@ -1,27 +0,0 @@
-From 5aed220986528c282c92125fc11e61ee67031555 Mon Sep 17 00:00:00 2001
-From: tigro <tigro@msvsphere-os.ru>
-Date: Mon, 9 Dec 2024 13:22:40 +0300
-Subject: [PATCH] Our isolinux.cfg is in cp866 encoding
-
----
- src/bin/mkksiso | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/bin/mkksiso b/src/bin/mkksiso
-index 42cdbfb..c9cfedd 100755
---- a/src/bin/mkksiso
-+++ b/src/bin/mkksiso
-@@ -294,8 +294,8 @@ def EditIsolinux(rm_args, add_args, new_volid, old_volid, tmpdir):
-     change_volid = old_volid != new_volid
- 
-     # Edit the config file, save the new one as .new
--    with open(orig_cfg, "r") as in_fp:
--        with open(orig_cfg + ".new", "w") as out_fp:
-+    with open(orig_cfg, "r", encoding="cp866") as in_fp:
-+        with open(orig_cfg + ".new", "w", encoding="cp866") as out_fp:
-             for line in in_fp:
-                 if change_volid and old_volid in line:
-                     line = line.replace(old_volid, new_volid)
--- 
-2.47.1
-

SOURCES/0004-Set-LatGrkCyr-8x16-as-default-font-instead-of-eurlat.patch

@@ -1,28 +0,0 @@
-From 850c748ef3d7ad4e4cd36216d797736e450fba08 Mon Sep 17 00:00:00 2001
-From: tigro <tigro@msvsphere-os.ru>
-Date: Mon, 12 Aug 2024 12:15:27 +0300
-Subject: [PATCH 4/4] Set latarcyrheb-sun16 as default font instead of eurlatgr
-
----
- share/templates.d/99-generic/config_files/common/i18n          | 2 +-
- share/templates.d/99-generic/config_files/common/vconsole.conf | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/share/templates.d/99-generic/config_files/common/i18n b/share/templates.d/99-generic/config_files/common/i18n
-index b254232..7b4682c 100644
---- a/share/templates.d/99-generic/config_files/common/i18n
-+++ b/share/templates.d/99-generic/config_files/common/i18n
-@@ -1 +1 @@
--SYSFONT="eurlatgr"
-+SYSFONT="LatGrkCyr-8x16"
-diff --git a/share/templates.d/99-generic/config_files/common/vconsole.conf b/share/templates.d/99-generic/config_files/common/vconsole.conf
-index 2bd7892..1456d03 100644
---- a/share/templates.d/99-generic/config_files/common/vconsole.conf
-+++ b/share/templates.d/99-generic/config_files/common/vconsole.conf
-@@ -1,2 +1,2 @@
- KEYMAP=us
--FONT=eurlatgr
-+FONT=latarcyrheb-sun16
--- 
-2.46.0
-

SPECS/lorax.spec

@@ -3,7 +3,7 @@
 %define debug_package %{nil}
 
 Name:           lorax
-Version:        34.9.26
+Version:        34.9.25
 Release:        1%{?dist}.inferit.1
 Summary:        Tool for creating the anaconda install images
 
@@ -19,20 +19,14 @@ Source0:        %{name}-%{version}.tar.gz
 Patch1001:      0001-Backport-dracut-chroot-umount-fix.patch
 Patch1002:      0002-Fix-replace-command-utf8-handling.patch
 Patch1003:      0003-Add-iconv-template-command.patch
-Patch1004:      0004-Set-LatGrkCyr-8x16-as-default-font-instead-of-eurlat.patch
-Patch1005:      0001-Our-isolinux.cfg-is-in-cp866-encoding.patch
 
 BuildRequires:  python3-devel
 BuildRequires:  make
 BuildRequires:  systemd-rpm-macros
 
 Requires:       lorax-templates
-%if 0%{?msvsphere} >= 9
-Requires:       lorax-templates-msvsphere
-%else
 %if 0%{?rhel} >= 9
-Requires:       lorax-templates-rhel
+Requires:       lorax-templates-msvsphere
-%endif
 %endif
 
 Requires:       cpio
@@ -196,34 +190,25 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
 %{_datadir}/lorax/templates.d/*
 
 %changelog
-* Mon Dec 09 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.9.26-1.inferit.1
+* Wed Apr 03 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.9.25-1.inferit.1
-- Our isolinux.cfg is in cp866 encoding
+- Change depend to lorax-templates-msvsphere
-
-* Mon Aug 12 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.9.26-1.inferit
-- Set latarcyrheb-sun16 as default font instead of eurlatg
-
-* Thu Jul 18 2024 Brian C. Lane <bcl@redhat.com> 34.9.26-1
-- monitor: Skip repo errors involving CDROM/file source (bcl) (bcl)
-  Resolves: RHEL-4658
-- rsyslog.conf: Update to use current config syntax (bcl) (bcl)
-  Resolves: RHEL-46857
-
-* Tue Feb 06 2024 Brian C. Lane <bcl@redhat.com> 34.9.25-1
-- templates: Remove libreport bugzilla plugins (bcl)
-  Resolves: RHEL-24420
-
-* Fri Jan 19 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.9.23-1.inferit.2
-- bump retries count
 
-* Wed Jul 26 2023 Eugene Zamriy <ezamriy@msvsphere.ru> - 34.9.20-1.inferit.1
+* Tue Apr 02 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.9.25-1.inferit
 - templates: Fixed UTF-8 handling in replace command
 - templates: Added iconv command to convert from UTF-8 to another encoding
-
-* Thu Apr 06 2023 Eugene Zamriy <ezamriy@msvsphere.ru> - 34.9.20-1.inferit
 - Backported DracutChroot dirs umount patch from upstream
   Without that patch pungi fails on building an EL9 image
 - lorax-templates-rhel requirement replaced with lorax-templates-msvsphere
-- Rebuilt for MSVSphere 9.1
+
+* Tue Feb 06 2024 Brian C. Lane <bcl@redhat.com> 34.9.25-1
+- templates: Remove libreport bugzilla plugins (bcl)
+  Resolves: RHEL-24420
+
+* Fri Nov 03 2023 Brian C. Lane <bcl@redhat.com> 34.9.24-1
+- Add setpriv as ostree containers dependency (jkonecny) (jkonecny)
+  Resolves: RHEL-15123
+* Fri Apr 14 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 34.9.23-1
+- Rebuilt for MSVSphere 9.2 beta
 
 * Wed Jan 11 2023 Brian C. Lane <bcl@redhat.com> 34.9.23-1
 - rsyslog.conf: Set WorkDirectory to /var/lib/rsyslog (bcl)