From 8b325189d9f3c5baee587601d3d24c6a00858b6b Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 23:28:53 +0100
Subject: [PATCH] disable custom installation of unifont.pf2 [release
 2.02-2mamba;Tue Dec 19 2017]

---
 ...ch => grub-2.02-openmamba_boot_choices.patch |  3 +--
 grub.spec                                       | 17 +++++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)
 rename grub-2.02_beta3-openmamba_boot_choices.patch => grub-2.02-openmamba_boot_choices.patch (94%)

diff --git a/grub-2.02_beta3-openmamba_boot_choices.patch b/grub-2.02-openmamba_boot_choices.patch
similarity index 94%
rename from grub-2.02_beta3-openmamba_boot_choices.patch
rename to grub-2.02-openmamba_boot_choices.patch
index 845182b..f5be4a3 100644
--- a/grub-2.02_beta3-openmamba_boot_choices.patch
+++ b/grub-2.02-openmamba_boot_choices.patch
@@ -1,10 +1,9 @@
 --- grub-2.02_beta3/util/grub.d/10_linux.in.orig	2016-08-25 21:42:17.171800345 +0200
 +++ grub-2.02_beta3/util/grub.d/10_linux.in	2016-08-25 21:53:04.725194113 +0200
-@@ -235,16 +235,42 @@
+@@ -235,16 +235,41 @@
      fi
      # TRANSLATORS: %s is replaced with an OS name
      echo "submenu '$(gettext_printf "Advanced options for %s" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {"
-+    [ -e /etc/grub.d/05_theme_openmamba ] && . /etc/grub.d/05_theme_openmamba | grep color
      is_top_level=false
 +  else
 +    linux_entry "${OS}" "${version}" default \
diff --git a/grub.spec b/grub.spec
index f64bd59..bc06abc 100644
--- a/grub.spec
+++ b/grub.spec
@@ -4,7 +4,7 @@
 Name:          grub
 Epoch:         2
 Version:       2.02
-Release:       1mamba
+Release:       2mamba
 Summary:       A Multiboot boot loader derived from GRUB, the GRand Unified Bootloader
 Group:         System/Kernel and Hardware
 Vendor:        openmamba
@@ -23,7 +23,7 @@ Source3:       grub-2.00-openmamba-conf-other
 Source4:       %{name}2-sysconfig
 Source5:       grub-2.00-openmamba-conf-other-linux
 Source6:       %{name}2-conf-failsafe
-Patch1:        grub-2.02_beta3-openmamba_boot_choices.patch
+Patch1:        grub-2.02-openmamba_boot_choices.patch
 Patch2:        grub-2.00-stdio.patch
 Patch3:        %{name}2-1.97-sysconfig.patch
 Patch9:        %{name}2-1.99-fix_saved_entry_default.patch
@@ -112,6 +112,8 @@ ld -v | grep "gold" && {
    exit 1
 }
 
+sh ./linguas.sh
+
 %build
 #:<< _EOF
 ./autogen.sh
@@ -142,8 +144,8 @@ ld -v | grep "gold" && {
 # don't use % make because unset *FLAGS are needed
 make
 
-# Generate Latin-1, Latin Extended A+B, Arrows, Box and Block characters:
-./grub-mkfont --output=unifont.pf2 --range=0x0000-0x0241,0x2190-0x21FF,0x2500-0x259f unifont.bdf
+## Generate Latin-1, Latin Extended A+B, Arrows, Box and Block characters:
+#./grub-mkfont --output=unifont.pf2 --range=0x0000-0x0241,0x2190-0x21FF,0x2500-0x259f unifont.bdf
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@@ -199,7 +201,7 @@ cp grub-core/{*.mod,*.lst,*.img,*.sh,*.lst} %{buildroot}%{_prefix}/lib/grub/${AR
 #cp bootx64.efi %{buildroot}%{_prefix}/lib/grub/
 %endif
 
-install -D -m0644 unifont.pf2 %{buildroot}/boot/grub/unifont.pf2
+#install -D -m0644 unifont.pf2 %{buildroot}/boot/grub/unifont.pf2
 install -D -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/default/grub
 #install -D -m0755 %{SOURCE3} %{buildroot}%{_sysconfdir}/grub.d/20_other
 #install -D -m0755 %{SOURCE5} %{buildroot}%{_sysconfdir}/grub.d/30_other_linux
@@ -214,6 +216,7 @@ exit $?
 _EOF
 chmod +x %{buildroot}%{_sbindir}/update-grub
 
+install -d -m0755 %{buildroot}/boot/grub
 install -d -m0755 %{buildroot}/boot/efi
 
 %find_lang grub || touch %{name}.lang
@@ -322,7 +325,6 @@ fi
 %{_sbindir}/grub-probe
 %{_sbindir}/update-grub
 %dir /boot/grub
-/boot/grub/unifont.pf2
 %dir %{_datadir}/grub
 %{_datadir}/grub/ascii.h
 %{_datadir}/grub/ascii.pf2
@@ -371,6 +373,9 @@ fi
 %{_prefix}/lib/grub/x86_64-efi/*
 
 %changelog
+* Tue Dec 19 2017 Silvan Calarco <silvan.calarco@mambasoft.it> 2.02-2mamba
+- disable custom installation of unifont.pf2
+
 * Mon Oct 30 2017 Silvan Calarco <silvan.calarco@mambasoft.it> 2.02-1mamba
 - update to 2.02
 - added patch to silent the "Booting" message