grub: Update to 2.00.

[people/amarx/ipfire-3.x.git] / grub / grub.nm

diff --git a/grub/grub.nm b/grub/grub.nm
index 98658a0d49e926d9586b1395a8dee040242c71c7..aa5121b8633a2af6345dcb903d0ceacdaf532a9e 100644 (file)
--- a/grub/grub.nm
+++ b/grub/grub.nm
@@ -5,9 +5,7 @@
 
 name       = grub
 version    = 2.00
-prerelease = beta5
-release    = 0.3.%{prerelease}
-thisapp    = %{name}-%{version}~%{prerelease}
+release    = 1
 sup_arches = x86_64 i686
 
 groups     = System/Boot
@@ -25,6 +23,9 @@ end
 source_dl  = http://ftp.gnu.org/gnu/grub/ ftp://alpha.gnu.org/gnu/grub/
 sources    = %{thisapp}.tar.xz
 
+# Unifont
+unifont = /usr/share/X11/fonts/misc/unifont.pcf.gz
+
 build
        requires
                autoconf
@@ -32,15 +33,20 @@ build
                automake
                bison
                bzip2-devel
+               dejavu-fonts-sans-fonts
                flex
                freetype-devel
                gettext
                libdevmapper-devel
                ncurses-devel
                zlib-devel
+               %{unifont}
        end
 
        prepare_cmds
+               cp -vf %{unifont} unifont.pcf.gz
+               ./autogen.sh
+
                # Create a copy of the source tree to build
                # an EFI enabled version of grub.
                cp -pR . %{DIR_SRC}/%{thisapp}-efi
@@ -52,7 +58,6 @@ build
 
        configure_options += \
                --target="i386" \
-               --datadir=%{libdir} \
                --with-platform=pc \
                --program-transform-name=s,grub,grub, \
                --disable-werror \
@@ -106,6 +111,24 @@ build
                mkdir -pv %{BUILDROOT}/boot/grub
                touch %{BUILDROOT}/boot/grub/grub.cfg
                ln -svf ../boot/grub/grub.cfg %{BUILDROOT}%{sysconfdir}/grub2.cfg
+
+               # Don't ship the default theme, replace it by our own one.
+               rm -rfv %{BUILDROOT}/boot/grub/themes/starfield \
+                       %{datadir}/grub/themes
+               mkdir -pv %{BUILDROOT}/boot/grub/themes/system
+               cp -rfv %{DIR_SOURCE}/theme/* \
+                       %{BUILDROOT}/boot/grub/themes/system/
+
+               # Prepare the fonts.
+               mkdir -pv %{BUILDROOT}/boot/grub/themes/system
+               pushd %{BUILDROOT}/boot/grub/themes/system/
+               %{BUILDROOT}%{bindir}/grub-mkfont -o DejaVuSans-10.pf2 -s 10 \
+                       %{datadir}/fonts/dejavu/DejaVuSans.ttf
+               %{BUILDROOT}%{bindir}/grub-mkfont -o DejaVuSans-12.pf2 -s 12 \
+                       %{datadir}/fonts/dejavu/DejaVuSans.ttf
+               %{BUILDROOT}%{bindir}/grub-mkfont -o DejaVuSans-Bold-14.pf2 \
+                       -s 14 %{datadir}/fonts/dejavu/DejaVuSans-Bold.ttf
+               popd
        end
 
        debuginfo_strict_build_id = false
@@ -122,22 +145,13 @@ packages
                requires
                        gettext
                        os-prober
-                       /usr/share/X11/fonts/misc/unifont.pcf.gz
-                       system-logos
+                       system-logos >= 2
                end
 
                configfiles
                        /boot/grub/grub.cfg
                        /etc/default/grub
                end
-
-               # Generate grub compatible font for graphical boot menu
-               # This only converts Latin-1, Latin Extended A+B, Arrows, Box and Block characters
-               script postin
-                       /usr/bin/grub-mkfont --output /boot/grub/unifont.pf2 \
-                               --range=0x0000-0x0241,0x2190-0x21FF,0x2500-0x259f \
-                               /usr/share/X11/fonts/misc/unifont.pcf.gz
-               end
        end
 
        package %{name}-efi