[packages/terminus-font] - add fontconfig config (from fc); use regular build style

arekm arekm at pld-linux.org
Fri Nov 14 09:44:39 CET 2014


commit 15bcd76d72dfa0ba3a77a8768d368591d0070af2
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Fri Nov 14 09:44:34 2014 +0100

    - add fontconfig config (from fc); use regular build style

 terminus-font.spec             | 18 ++++++++++++++----
 terminus-fonts-fontconfig.conf | 16 ++++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)
---
diff --git a/terminus-font.spec b/terminus-font.spec
index 84c98ad..a3da073 100644
--- a/terminus-font.spec
+++ b/terminus-font.spec
@@ -8,6 +8,7 @@ License:	SIL Open Font License v1.1 (font), GPL v2+ (utils)
 Group:		Fonts
 Source0:	http://downloads.sourceforge.net/terminus-font/%{name}-%{version}.tar.gz
 # Source0-md5:	1ec1bee67a1c017f349bc8558b2d4fa6
+Source1:	terminus-fonts-fontconfig.conf
 URL:		http://sourceforge.net/projects/terminus-font/
 BuildRequires:	perl-base
 BuildRequires:	xorg-app-bdftopcf
@@ -114,14 +115,21 @@ Ten pakiet zawiera font Terminus dla X11.
 %setup -q
 
 %build
-%{__make}
+./configure \
+	--x11dir=%{_datadir}/fonts/local \
+	--psfdir=/lib/kbd/consolefonts
+%{__make} pcf psf
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-	x11dir=$RPM_BUILD_ROOT%{_datadir}/fonts/local \
-	psfdir=$RPM_BUILD_ROOT/lib/kbd/consolefonts
+install -d $RPM_BUILD_ROOT{%{_datadir}/fontconfig/conf.avail,%{_sysconfdir}/fonts/conf.d}
+
+%{__make} install-psf install-pcf install-ref \
+	DESTDIR=$RPM_BUILD_ROOT
+
+install -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/fontconfig/conf.avail/63-%{name}.conf
+ln -s %{_datadir}/fontconfig/conf.avail/63-%{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -141,3 +149,5 @@ fontpostinst local
 %defattr(644,root,root,755)
 %doc AUTHORS CHANGES README
 %{_datadir}/fonts/local/ter-*.pcf.gz
+%{_datadir}/fontconfig/conf.avail/63-%{name}.conf
+%{_sysconfdir}/fonts/conf.d/63-%{name}.conf
diff --git a/terminus-fonts-fontconfig.conf b/terminus-fonts-fontconfig.conf
new file mode 100644
index 0000000..7000f66
--- /dev/null
+++ b/terminus-fonts-fontconfig.conf
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>monospace</family>
+    <prefer>
+      <family>Terminus</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>Terminus</family>
+    <default>
+      <family>monospace</family>
+    </default>
+  </alias>
+</fontconfig>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/terminus-font.git/commitdiff/15bcd76d72dfa0ba3a77a8768d368591d0070af2



More information about the pld-cvs-commit mailing list