Accepting request 214019 from home:arvidjaar:grub2-next

- package autoiso.cfg and osdetect.cfg as documentation
- add 0001-look-for-DejaVu-also-in-usr-share-fonts-truetype.patch -
  fix configure test for DejaVu font
- add dejavu-fonts to BR (needed to build starfield theme)
- package starfield theme as grub2-branding-upstream
- add grub2-use-DejaVuSansMono-for-starfield-theme.patch - use fixed width
  font for starfield theme
- clarify that grub2 subpackage contains only user space tools

OBS-URL: https://build.opensuse.org/request/show/214019
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=65

0001-look-for-DejaVu-also-in-usr-share-fonts-truetype.patch

@@ -0,0 +1,26 @@
+From 2b1fbf23b49586e414d3212544395e18b1c0b9cb Mon Sep 17 00:00:00 2001
+From: Andrey Borzenkov <arvidjaar@gmail.com>
+Date: Sun, 12 Jan 2014 16:16:26 +0400
+Subject: [PATCH] look for DejaVu also in /usr/share/fonts/truetype
+
+It is installed in this path on openSUSE.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7c5d080..e80c074 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1375,7 +1375,7 @@ fi
+ 
+ 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/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu /usr/share/fonts/truetype; do
+         if test -f "$dir/DejaVuSans.$ext"; then
+           DJVU_FONT_SOURCE="$dir/DejaVuSans.$ext"
+           break 2
+-- 
+1.8.4
+

grub2-use-DejaVuSansMono-for-starfield-theme.patch

@@ -0,0 +1,15 @@
+Index: grub-2.02~beta2/configure.ac
+===================================================================
+--- grub-2.02~beta2.orig/configure.ac
++++ grub-2.02~beta2/configure.ac
+@@ -1376,8 +1376,8 @@ fi
+ 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 /usr/share/fonts/truetype; do
+-        if test -f "$dir/DejaVuSans.$ext"; then
+-          DJVU_FONT_SOURCE="$dir/DejaVuSans.$ext"
++        if test -f "$dir/DejaVuSansMono.$ext"; then
++          DJVU_FONT_SOURCE="$dir/DejaVuSansMono.$ext"
+           break 2
+         fi
+      done

grub2.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Jan 15 15:46:31 UTC 2014 - arvidjaar@gmail.com
+
+- package autoiso.cfg and osdetect.cfg as documentation
+- add 0001-look-for-DejaVu-also-in-usr-share-fonts-truetype.patch -
+  fix configure test for DejaVu font
+- add dejavu-fonts to BR (needed to build starfield theme)
+- package starfield theme as grub2-branding-upstream
+- add grub2-use-DejaVuSansMono-for-starfield-theme.patch - use fixed width
+  font for starfield theme
+- clarify that grub2 subpackage contains only user space tools
+
 -------------------------------------------------------------------
 Wed Jan 15 06:18:10 UTC 2014 - mchang@suse.com
 

grub2.spec

@@ -29,6 +29,7 @@ BuildRequires:  glibc-devel
 %endif
 BuildRequires:  automake
 BuildRequires:  bison
+BuildRequires:  dejavu-fonts
 BuildRequires:  device-mapper-devel
 BuildRequires:  fdupes
 BuildRequires:  flex
@@ -125,6 +126,8 @@ Patch24:        grub2-secureboot-provide-linuxefi-config.patch
 Patch29:        grub2-secureboot-chainloader.patch
 Patch34:        grub2-secureboot-use-linuxefi-on-uefi-in-os-prober.patch
 Patch35:        grub2-linguas.sh-no-rsync.patch
+Patch36:        0001-look-for-DejaVu-also-in-usr-share-fonts-truetype.patch
+Patch37:        grub2-use-DejaVuSansMono-for-starfield-theme.patch
 # Btrfs snapshot booting related patches
 Patch101:       0002-btrfs-add-ability-to-boot-from-subvolumes.patch
 Patch102:       0003-cmdline-add-envvar-loader_cmdline_append.patch
@@ -155,6 +158,7 @@ highly configurable and customizable bootloader with modular
 architecture.  It support rich scale of kernel formats, file systems,
 computer architectures and hardware devices.
 
+This package includes user space utlities to manage GRUB on your system.
 
 
 Authors:
@@ -167,6 +171,15 @@ Authors:
     Robert Millan
     Carles Pina
 
+%package branding-upstream
+
+Summary:        Upstream branding for GRUB2's graphical console
+Group:          System/Fhs
+Requires:       %{name} = %{version}-%{release}
+
+%description branding-upstream
+Upstream branding for GRUB2's graphical console
+
 %package %{grubarch}
 
 Summary:        Bootloader with support for Linux, Multiboot and more
@@ -242,6 +255,8 @@ mv po/grub.pot po/%{name}.pot
 %patch29 -p1
 %patch34 -p1
 %patch35 -p1
+%patch36 -p1
+%patch37 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
@@ -550,6 +565,7 @@ fi
 %doc COPYING NEWS README
 %doc THANKS TODO ChangeLog
 %doc README.openSUSE
+%doc docs/autoiso.cfg docs/osdetect.cfg
 %dir /boot/%{name}
 %ghost /boot/%{name}/grub.cfg
 %{_sysconfdir}/bash_completion.d/grub
@@ -587,6 +603,7 @@ fi
 %{_bindir}/%{name}-syslinux2cfg
 %dir %{_libdir}/%{name}
 %dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/themes
 %if 0%{?suse_version} >= 1140
 %{_datadir}/%{name}/*.pf2
 %endif
@@ -621,6 +638,9 @@ fi
 %{_mandir}/man8/%{name}-set-default.8.*
 %{_mandir}/man8/%{name}-sparc64-setup.8.*
 
+%files branding-upstream
+%{_datadir}/%{name}/themes/starfield
+
 %if ! 0%{?only_efi:1}
 
 %files %{grubarch}