Backport fix for finding unicode grub2 font file (rhbz#2037096)

0001-Copy-unicode.pf2-from-correct-path.patch

@@ -0,0 +1,29 @@
+From 3fe2b3927e21e8a81c53baae83243100acad3b0c Mon Sep 17 00:00:00 2001
+From: Freeman Zhang <zhanggyb@lenovo.com>
+Date: Thu, 25 Nov 2021 11:23:17 +0800
+Subject: [PATCH] Copy 'unicode.pf2' from correct path
+
+The 'unicode.pf2' font file for grub2 does not exist in
+'/boot/efi/EFI/' any more in Fedora 35, and causes image build
+fail. Use '/usr/share/grub/unicode.pf2' which belongs to
+'grub2-tools' package instead.
+---
+ imgcreate/live.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/imgcreate/live.py b/imgcreate/live.py
+index e71cc49..8f971b6 100644
+--- a/imgcreate/live.py
++++ b/imgcreate/live.py
+@@ -720,7 +720,7 @@ menu end
+                  ("/boot/efi/EFI/*/gcd%s.efi" % (self.efiarch.lower(),), "/EFI/BOOT/grub%s.efi" % (self.efiarch.lower(),), True),
+                  ("/boot/efi/EFI/*/shimia32.efi", "/EFI/BOOT/BOOTIA32.EFI", False),
+                  ("/boot/efi/EFI/*/gcdia32.efi", "/EFI/BOOT/grubia32.efi", False),
+-                 ("/boot/efi/EFI/*/fonts/unicode.pf2", "/EFI/BOOT/fonts/", True),
++                 ("/usr/share/grub/unicode.pf2", "/EFI/BOOT/fonts/", True),
+                 ]
+         makedirs(isodir+"/EFI/BOOT/fonts/")
+         for src, dest, required in files:
+-- 
+2.33.1
+

livecd-tools.spec

@@ -17,7 +17,7 @@
 Summary: Tools for building live CDs
 Name: livecd-tools
 Version: 28.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 %if 0%{?fedora}
 Epoch: 1
 %endif
@@ -26,6 +26,7 @@ URL: https://github.com/livecd-tools/livecd-tools
 Source0: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.gz
 
 Patch1: 0001-switch-from-authconfig-to-authselect.patch
+Patch2: 0001-Copy-unicode.pf2-from-correct-path.patch
 
 BuildRequires: make
 %if %{with python2}
@@ -227,6 +228,9 @@ rm -rfv %{buildroot}%{_mandir}/man8/livecd-iso-to-*
 %endif
 
 %changelog
+* Tue Jan 11 2022 Neal Gompa <ngompa@fedoraproject.org> - 1:28.3-4
+- Backport fix for finding unicode grub2 font file (rhbz#2037096)
+
 * Mon Aug 23 2021 Pavel Březina <pbrezina@redhat.com> - 1:28.3-3
 - Switch from authconfig to authselect (rhbz#1982159)