[packages/grub2-fonts-unifont] - updated font to 7.0.06 - updated build to current grub2 expectations

[baggins]

commit 691cbc019b06bae3c424a2340e3eb2dd40ef3c22
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Jan 22 21:50:12 2015 +0100

    - updated font to 7.0.06
    - updated build to current grub2 expectations

 grub2-fonts-unifont.spec | 42 +++++++++---------------------------------
 simple_convert           |  3 ---
 2 files changed, 9 insertions(+), 36 deletions(-)
---
diff --git a/grub2-fonts-unifont.spec b/grub2-fonts-unifont.spec
index aa58767..5a0b41d 100644
--- a/grub2-fonts-unifont.spec
+++ b/grub2-fonts-unifont.spec
@@ -1,22 +1,15 @@
 # TODO - find and test other unicode fonts for grub2.
 
-%define	 _enable_debug_packages 0
-%define _snap	20080907
-%define	_sizes	{12 18 24 32}
-%define _fontname unifont
-%define _destdir  /grub2/fonts
 Summary:	Unifont font for grub2 gfxterm mode
 Summary(pl.UTF-8):	Czcionka unifont do trybu graficznego bootloadera grub2
-Name:		grub2-fonts-%{_fontname}
-Version:	5.1
+Name:		grub2-fonts-unifont
+Version:	7.0.06
 Release:	1
 License:	GNU GPL v.2
 Group:		Fonts
-Source0:	http://unifoundry.com/%{_fontname}-%{version}.%{_snap}.ttf.gz
-# Source0-md5:	708a693e340902779ec9ad13acae279a
-Source1:	simple_convert
+Source0:	http://unifoundry.com/pub/unifont-%{version}/font-builds/unifont-%{version}.ttf
+# Source0-md5:	a3f68517ddc92a4a2ea26f07c75ad7a9
 URL:		http://unifoundry.com/unifont.html
-BuildRequires:	/usr/bin/ttf2bdf
 BuildRequires:	grub2
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -30,37 +23,20 @@ Czcionka unifont do trybu graficznego bootloadera grub2.
 %prep
 %setup -q -cT %{name}-%{version}
 install %{SOURCE0} .
-install %{SOURCE1} .
-gzip -d %{_fontname}-%{version}.%{_snap}.ttf.gz
-mv %{_fontname}-%{version}.%{_snap}.ttf %{_fontname}.ttf
 
 %build
-for i in %{_sizes}; do
-	# /usr/bin/ttf2bdf -v -r 75 -p $i -o %{_fontname}$i.bdf -t %{_fontname} %{_fontname}.ttf
-	#/sbin/grub-mkfont --output=%{_fontname}$i.pf2 %{_fontname}$i.bdf
-	sh simple_convert $i %{_fontname}
-done
+/sbin/grub-mkfont --output=unicode.pf2 unifont-%{version}.ttf
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/boot/grub/fonts
 
-install -d $RPM_BUILD_ROOT%{_datadir}%{_destdir}
-#gzip -9 *.pf2
-cp *.pf2* $RPM_BUILD_ROOT%{_datadir}%{_destdir}
+cp *.pf2 $RPM_BUILD_ROOT/boot/grub/fonts
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-echo "These are (%{_sizes})pt/75dpi fonts.
-Copy one somewhere under /boot location and set in grub.cfg.
-To get other sizes rebuild package setting desired _sizes."
-
-#%post -l pl.UTF-8
-#echo "To są czcionki o wielkościach  (%{_sizes})pt/75dpi.
-#Skopiuj którąś do katalogu /boot i wskaż w grub.cfg.
-#Żeby uzyskać inne wielkości przebuduj pakiet zmieniając parametr _sizes."
-
 %files
 %defattr(644,root,root,755)
-%{_datadir}%{_destdir}
+%dir /boot/grub/fonts
+/boot/grub/fonts/unicode.pf2
diff --git a/simple_convert b/simple_convert
deleted file mode 100644
index dd45580..0000000
--- a/simple_convert
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-/usr/bin/ttf2bdf -v -r 75 -p "$1" -o "$2$1".bdf -t "$2" "$2".ttf
-/sbin/grub-mkfont --output="$2$1".pf2 "$2$1".bdf
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/grub2-fonts-unifont.git/commitdiff/691cbc019b06bae3c424a2340e3eb2dd40ef3c22