diff --git a/SOURCES/0004-Translate-live-image-bootloader-to-Russian.patch b/SOURCES/0004-Translate-live-image-bootloader-to-Russian.patch index b7bc791..9a545b4 100644 --- a/SOURCES/0004-Translate-live-image-bootloader-to-Russian.patch +++ b/SOURCES/0004-Translate-live-image-bootloader-to-Russian.patch @@ -1,15 +1,15 @@ -From f1e09531491c81d91327d3684193594a355954ae Mon Sep 17 00:00:00 2001 +From 54d9c3bb700838579d1d329bdbdeae4372d76669 Mon Sep 17 00:00:00 2001 From: tigro Date: Sat, 29 Jul 2023 15:34:37 +0200 -Subject: [PATCH 4/4] Translate live image bootloader to Russian +Subject: [PATCH] Translate live image bootloader to Russian --- - 80-rhel/live/config_files/x86/grub2-efi.cfg | 9 +++++-- - 80-rhel/live/config_files/x86/isolinux.cfg | 27 ++++++++++++--------- - 80-rhel/live/efi.tmpl | 6 +++++ - 80-rhel/live/x86.tmpl | 15 +++++++++++- + 80-rhel/live/config_files/x86/grub2-efi.cfg | 9 ++++-- + 80-rhel/live/config_files/x86/isolinux.cfg | 27 ++++++++++-------- + 80-rhel/live/efi.tmpl | 6 ++++ + 80-rhel/live/x86.tmpl | 31 ++++++++++++++++++++- 80-rhel/x86.tmpl | 2 +- - 5 files changed, 43 insertions(+), 16 deletions(-) + 5 files changed, 59 insertions(+), 16 deletions(-) diff --git a/80-rhel/live/config_files/x86/grub2-efi.cfg b/80-rhel/live/config_files/x86/grub2-efi.cfg index 89a74ea..f26d4e6 100644 @@ -144,10 +144,10 @@ index 42d18f4..806e602 100644 replace @KERNELNAME@ vmlinuz ${eficonf} replace @KERNELPATH@ /${kdir}/vmlinuz ${eficonf} diff --git a/80-rhel/live/x86.tmpl b/80-rhel/live/x86.tmpl -index 473faab..bcfaf53 100644 +index 473faab..c4c2c20 100644 --- a/80-rhel/live/x86.tmpl +++ b/80-rhel/live/x86.tmpl -@@ -42,12 +42,25 @@ install ${configdir}/grub.conf ${BOOTDIR} +@@ -42,12 +42,41 @@ install ${configdir}/grub.conf ${BOOTDIR} install usr/share/anaconda/boot/syslinux-splash.png ${BOOTDIR}/splash.png install boot/memtest* ${BOOTDIR}/memtest @@ -157,6 +157,22 @@ index 473faab..bcfaf53 100644 ## configure bootloader replace @VERSION@ ${product.version} ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg -replace @PRODUCT@ '${product.name}' ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg ++%if product.name == 'MSVSphere GNOME': ++replace @PRODUCT@ 'МСВСфера' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg ++replace @FLAVOR@ ' GNOME' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg ++%endif ++%if product.name == 'MSVSphere Cinnamon': ++replace @PRODUCT@ 'МСВСфера' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg ++replace @FLAVOR@ ' Cinnamon' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg ++%endif ++%if product.name == 'MSVSphere KDE': ++replace @PRODUCT@ 'МСВСфера' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg ++replace @FLAVOR@ ' KDE' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg ++%endif ++%if product.name == 'MSVSphere XFCE': ++replace @PRODUCT@ 'МСВСфера' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg ++replace @FLAVOR@ ' XFCE' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg ++%endif +%if product.name == 'MSVSphere ARM': +replace @PRODUCT@ 'МСВСфера' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg +replace @FLAVOR@ ' АРМ' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg diff --git a/SPECS/lorax-templates-rhel.spec b/SPECS/lorax-templates-rhel.spec index a907de3..db562f1 100644 --- a/SPECS/lorax-templates-rhel.spec +++ b/SPECS/lorax-templates-rhel.spec @@ -1,6 +1,6 @@ Name: lorax-templates-msvsphere Version: 9.0 -Release: 37%{?dist}.5 +Release: 37%{?dist}.6 Summary: MSVSphere 9 build templates for lorax and livemedia-creator License: GPLv2+ @@ -50,6 +50,9 @@ install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{templatedir}/live/config_files/x86/ %{templatedir}/* %changelog +* Mon Aug 21 2023 Arkady L. Shane - 9.0-37.6 +- Added more products + * Sat Jul 29 2023 Arkady L. Shane - 9.0-37.5 - Disable geo location