Conflict older freetype

[packages/terminus-font.git] / terminus-font.spec

diff --git a/terminus-font.spec b/terminus-font.spec
index 06d368ccc5d9febb3ad197436cf54e363999285e..08f5ea8d0def045ec2ecfc489055a359fc7affef 100644 (file)
--- a/terminus-font.spec
+++ b/terminus-font.spec
@@ -1,16 +1,17 @@
 Summary:       A clean fixed width font
 Summary(pl.UTF-8):     Przejrzysty font o stałej szerokości
 Name:          terminus-font
-Version:       4.38
-Release:       1
-Epoch:         0
+Version:       4.40
+Release:       2
 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: a8e792fe6e84c86ed2b6ed3e2a12ba66
+# Source0-md5: 1e1df0d2c612c374ebe7966f90f04e0c
+Source1:       terminus-fonts-fontconfig.conf
 URL:           http://sourceforge.net/projects/terminus-font/
 BuildRequires: perl-base
 BuildRequires: xorg-app-bdftopcf
+Conflicts:     freetype < 1:2.7.1
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -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