Fix DejaVu font detection for starfield theme

diff --git a/grub2-fonts_path.patch b/grub2-fonts_path.patch
new file mode 100644 (file)
index 0000000..bb91b08
--- /dev/null
+++ b/grub2-fonts_path.patch
@@ -0,0 +1,12 @@
+diff -dur -x '*~' grub-2.00.orig/configure.ac grub-2.00/configure.ac
+--- grub-2.00.orig/configure.ac        2012-10-28 09:47:24.000000000 +0100
++++ grub-2.00/configure.ac     2012-10-28 09:48:06.438240771 +0100
+@@ -940,7 +940,7 @@
+ 
+ if test x"$starfield_excuse" = x; then
+    for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
+-     for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu; do
++     for dir in . /usr/share/fonts/TTF /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu; do
+         if test -f "$dir/DejaVuSans.$ext"; then
+           DJVU_FONT_SOURCE="$dir/DejaVuSans.$ext"
+           break 2

diff --git a/grub2.spec b/grub2.spec
index 70a74fe36d070b33b49675ed2b291a86cea2403f..c95bce78e4c995ad167dae7e9168f354dcfe09c1 100644 (file)
--- a/grub2.spec
+++ b/grub2.spec
@@ -71,10 +71,12 @@ Patch6:             ppc.patch
 Patch7:                %{name}-awk.patch
 Patch8:                posix.patch
 Patch9:                %{name}-gets.patch
+Patch10:       %{name}-fonts_path.patch
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake >= 1:1.11.1-1
 BuildRequires: bison
 BuildRequires: device-mapper-devel
+BuildRequires: fonts-TTF-DejaVu
 BuildRequires: freetype-devel
 BuildRequires: gawk
 BuildRequires: gettext-devel
@@ -249,6 +251,7 @@ Converts common font file formats into PF2.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 %if "%{cc_version}" < "3.4"
 grep -rl -- -Wno-missing-field-initializers . | xargs %{__sed} -i -e 's,-Wno-missing-field-initializers,,'