[kbd] Fix unicode_start hardcodes font

[vcrhonek]

commit 415fc12aa466b1afa9b6730a760a168af9a34e85
Author: Vitezslav Crhonek <vcrhonek at redhat.com>
Date:   Tue Aug 12 16:00:15 2014 +0200

    Fix unicode_start hardcodes font

 kbd-2.0.2-unicode-start-font.patch |   15 +++++++++++++++
 kbd.spec                           |   10 +++++++++-
 2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/kbd-2.0.2-unicode-start-font.patch b/kbd-2.0.2-unicode-start-font.patch
new file mode 100644
index 0000000..72d47f4
--- /dev/null
+++ b/kbd-2.0.2-unicode-start-font.patch
@@ -0,0 +1,15 @@
+diff -up kbd-2.0.2/src/unicode_start.orig kbd-2.0.2/src/unicode_start
+--- kbd-2.0.2/src/unicode_start.orig	2014-08-12 14:47:53.019028849 +0200
++++ kbd-2.0.2/src/unicode_start	2014-08-12 14:54:42.631427602 +0200
+@@ -72,7 +72,10 @@ stty iutf8
+ # have a Unicode map attached, or explicitly specified, e.g.,
+ # by giving `def.uni' as a second argument.
+ 
+-DEFAULT_UNICODE_FONT=latarcyrheb-sun16
++# Source /etc/vconsole.conf to get default font
++. /etc/vconsole.conf
++
++DEFAULT_UNICODE_FONT=$FONT
+ # Also drdos8x16 is a good candidate.
+ 
+ case "$#" in
diff --git a/kbd.spec b/kbd.spec
index 2573a71..3a4f472 100644
--- a/kbd.spec
+++ b/kbd.spec
@@ -1,6 +1,6 @@
 Name:           kbd
 Version:        2.0.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Tools for configuring the console (keyboard, virtual terminals, etc.)
 
 Group:          System Environment/Base
@@ -24,6 +24,9 @@ Patch3:         kbd-1.15.3-dumpkeys-man.patch
 Patch4:         kbd-1.15.5-sg-decimal-separator.patch
 # Patch5: adds xkb and legacy keymaps subdirs to loadkyes search path, bz 1028207 
 Patch5:         kbd-1.15.5-loadkeys-search-path.patch
+# Patch6: don't hardcode font used in unicode_start, take it from vconsole.conf,
+#   bz 1101007
+Patch6:         kbd-2.0.2-unicode-start-font.patch
 
 BuildRequires:  bison, flex, gettext, pam-devel, check-devel
 BuildRequires:  console-setup, xkeyboard-config
@@ -65,6 +68,7 @@ cp -fp %{SOURCE3} .
 %patch3 -p1 -b .dumpkeys-man
 %patch4 -p1 -b .sg-decimal-separator
 %patch5 -p1 -b .loadkeys-search-path
+%patch6 -p1 -b .unicode-start-font
 
 # 7-bit maps are obsolete; so are non-euro maps
 pushd data/keymaps/i386
@@ -177,6 +181,10 @@ rm -f $RPM_BUILD_ROOT/lib/kbd/keymaps/xkb/fi.map.gz
 /lib/kbd/keymaps/legacy
 
 %changelog
+* Tue Aug 12 2014 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.0.2-3
+- Fix unicode_start hardcodes font
+  Resolves: #1101007
+
 * Wed Jul 16 2014 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.0.2-2
 - Remove Finnish xkb converted layout
   Resolves: #1117891