From 171aabb89d277f3b28a981f73794b6232afa968b Mon Sep 17 00:00:00 2001 From: Mads Kiilerich Date: Thu, 10 May 2012 02:44:50 +0200 Subject: [PATCH] fixes for theme support - make the fonts that are used available The starfield theme is a bad example ... --- grub.default | 1 + grub2.spec | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/grub.default b/grub.default index 81ff487..5b9f56a 100644 --- a/grub.default +++ b/grub.default @@ -5,3 +5,4 @@ GRUB_DEFAULT=saved # GRUB_SERIAL_COMMAND="serial --unit=0 --speed=9600" GRUB_CMDLINE_LINUX="quiet rhgb" GRUB_DISABLE_RECOVERY="true" +GRUB_THEME=/boot/grub2/themes/system/theme.txt diff --git a/grub2.spec b/grub2.spec index ab82dbb..e60b05a 100644 --- a/grub2.spec +++ b/grub2.spec @@ -55,6 +55,7 @@ BuildRequires: /usr/lib/crt1.o glibc-static BuildRequires: autoconf automake autogen device-mapper-devel BuildRequires: freetype-devel gettext-devel git BuildRequires: texinfo +BuildRequires: dejavu-sans-fonts Requires: gettext os-prober which file system-logos Requires(pre): dracut @@ -249,8 +250,13 @@ ln -sf %{_sysconfdir}/default/grub \ cd .. %find_lang grub +# Fedora theme in /boot/grub2/themes/system/ cd $RPM_BUILD_ROOT tar xjf %{SOURCE5} +rm boot/grub2/themes/system/dejavu.pf2 +$RPM_BUILD_ROOT%{_bindir}/%{name}-mkfont -o boot/grub2/themes/system/DejaVuSans-10.pf2 -s 10 /usr/share/fonts/dejavu/DejaVuSans.ttf # "DejaVu Sans Regular 10" +$RPM_BUILD_ROOT%{_bindir}/%{name}-mkfont -o boot/grub2/themes/system/DejaVuSans-12.pf2 -s 12 /usr/share/fonts/dejavu/DejaVuSans.ttf # "DejaVu Sans Regular 12" +$RPM_BUILD_ROOT%{_bindir}/%{name}-mkfont -o boot/grub2/themes/system/DejaVuSans-Bold-14.pf2 -s 14 /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf # "DejaVu Sans Bold 14" %clean rm -rf $RPM_BUILD_ROOT @@ -334,6 +340,7 @@ fi %doc grub-%{tarversion}/ChangeLog grub-%{tarversion}/README.Fedora %doc grub-%{tarversion}/grub.html %doc grub-%{tarversion}/grub-dev.html grub-%{tarversion}/docs/font_char_metrics.png +%doc grub-%{tarversion}/themes/starfield/COPYING.CC-BY-SA-3.0 %exclude %{_mandir} %{_infodir}/grub2* /boot/grub2/themes/system @@ -381,6 +388,7 @@ fi %doc grub-%{tarversion}/ChangeLog grub-%{tarversion}/README.Fedora %doc grub-%{tarversion}/grub.html %doc grub-%{tarversion}/grub-dev.html grub-%{tarversion}/docs/font_char_metrics.png +%doc grub-%{tarversion}/themes/starfield/COPYING.CC-BY-SA-3.0 %exclude %{_mandir} %{_infodir}/grub2* /boot/grub2/themes/system