grub: Drop dependencies to all fonts and use Python 3

We no longer ship any fonts, but GRUB still depends on them.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/grub/grub.nm b/grub/grub.nm
index a5deb8e316a8198e8856c3d31205bbd82088dfb1..e5ad722d084013b3005639901903af35e3b4f036 100644 (file)
--- a/grub/grub.nm
+++ b/grub/grub.nm
@@ -5,7 +5,7 @@
 
 name       = grub
 version    = 2.06
-release    = 1
+release    = 1.1
 
 sup_arches = aarch64 x86_64
 thisapp    = %{name}-%{version}
@@ -25,26 +25,20 @@ end
 source_dl  = https://ftp.gnu.org/gnu/grub/
 sources    = %{thisapp}.tar.xz
 
-# Unifont
-unifont = /usr/share/X11/fonts/misc/unifont.pcf.gz
-
 build
        requires
                autoconf
-               autogen
                automake
                bison
                bzip2-devel
-               debugedit >= 5.3.5-2
-               dejavu-fonts-sans-fonts
                flex
                freetype-devel
                gettext
                gettext-devel
                libdevmapper-devel
                ncurses-devel
+               python3
                zlib-devel
-               %{unifont}
        end
 
        # Don't leak our CFLAGS to boot code
@@ -58,8 +52,7 @@ build
        end
 
        prepare_cmds
-               cp -vf %{unifont} unifont.pcf.gz
-               ./autogen.sh
+               PYTHON=%{python3} ./autogen.sh
 
                for platform in %{platforms}; do
                        cp -r %{DIR_APP} %{DIR_APP}-${platform}