From 5db760cfd892e19dc66892df60ce156d85e0e083 Mon Sep 17 00:00:00 2001
From: Peng Wu <pwu@redhat.com>
Date: Thu, 6 Feb 2020 15:13:28 +0800
Subject: [PATCH] Provide OpenType Bitmap fonts

Add ucs-miscfixed-opentype-fonts sub package
---
 ucs-miscfixed-fonts.spec | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/ucs-miscfixed-fonts.spec b/ucs-miscfixed-fonts.spec
index 9b0e060..5204abf 100644
--- a/ucs-miscfixed-fonts.spec
+++ b/ucs-miscfixed-fonts.spec
@@ -1,9 +1,13 @@
 %global fontname ucs-miscfixed
 %global fontconf 66-%{fontname}.conf
 
+%global common_desc \
+The usc-fixed-fonts package provides bitmap fonts for\
+locations such as terminals.
+
 Name: %{fontname}-fonts
 Version: 0.3
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: Public Domain
 URL: http://www.cl.cam.ac.uk/~mgk25/ucs-fonts.html
 Source0: http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts.tar.gz
@@ -12,17 +16,29 @@ BuildArch: noarch
 Summary: Selected set of bitmap fonts
 BuildRequires: fontpackages-devel
 BuildRequires: xorg-x11-font-utils
+Conflicts: ucs-miscfixed-opentype-fonts
 
 %description
-The usc-fixed-fonts package provides bitmap fonts for
-locations such as terminals.
+%common_desc
 
+%package -n ucs-miscfixed-opentype-fonts
+Summary:        Selected set of bitmap fonts (opentype version)
+License:        Public Domain
+Conflicts:      ucs-miscfixed-fonts
+
+%description -n ucs-miscfixed-opentype-fonts
+%common_desc
+
+This package contains the fonts in OpenType format.
 
 %prep
 %setup -q -c
 rm helvR12.bdf
 
 %build
+for i in `ls *.bdf`;
+do fonttosfnt -v -b -c -g 2 -m 2 -o ${i%%.bdf}.otb $i;
+done
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -31,6 +47,8 @@ install -m 0755 -d %{buildroot}%{_fontdir}
 
 install -m 0644 -p *.bdf %{buildroot}%{_fontdir}
 
+install -m 0644 -p *.otb %{buildroot}%{_fontdir}
+
 install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
 	%{buildroot}%{_fontconfig_confdir}
 
@@ -45,7 +63,15 @@ ln -s %{_fontconfig_templatedir}/%{fontconf} \
 
 %doc README	
 
+%_font_pkg -n ucs-miscfixed-opentype-fonts -f %{fontconf} *.otb
+
+%doc README
+
 %changelog
+* Thu Feb  6 2020 Peng Wu <pwu@redhat.com> - 0.3-22
+- Provide OpenType Bitmap fonts
+- Add ucs-miscfixed-opentype-fonts sub package
+
 * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.3-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild