From: Jan Rękorajski <baggins@pld-linux.org>
Date: Tue, 20 Jul 1999 11:04:33 +0000 (+0000)
Subject: - fixed usage of macros
X-Git-Tag: RA-1_0~16
X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffonty.git;a=commitdiff_plain;h=64fda6ecae8f4356207b19cbb8f1531e5820ee1d

- fixed usage of macros
- added/removed neccesary/obsolete patches
- FHS 2.0 compliance where needed
- gzipping docs where needed

Changed files:
    fonty.spec -> 1.12
---

diff --git a/fonty.spec b/fonty.spec
index c67d34f..5fa088e 100644
--- a/fonty.spec
+++ b/fonty.spec
@@ -2,11 +2,12 @@ Summary:	Fonts on Linux console
 Summary(pl):	Fonty na konsoli Linuxa
 Name:		fonty
 Version:	1.0
-Release:	2
+Release:	3
 Copyright:	GPL
 Group:		Utilities/Text
 Group(pl):	Narzêdzia/Tekst
-Source:		http://qrczak.home.ml.org/programy/linux/%{name}/%{name}-%{version}.tar.gz
+Source0:	http://qrczak.home.ml.org/programy/linux/%{name}/%{name}-%{version}.tar.gz
+Source1:        iso02grf.psf.gz
 URL:		http://qrczak.home.ml.org/programy/linux/fonty/
 Requires:	console-tools
 BuildRoot:	/tmp/%{name}-%{version}-root
@@ -29,7 +30,7 @@ CXXFLAGS=$RPM_OPT_FLAGS make \
 	consoleprefix=/usr \
 	konwertprefix=/usr \
 	perl=%{_bindir}/perl \
-	docdir=/usr/share/doc/fonty-%{version}
+	docdir=%{_docdir}/%{name}-%{version}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -37,7 +38,15 @@ make install \
 	consoleprefix=$RPM_BUILD_ROOT/usr \
 	konwertprefix=$RPM_BUILD_ROOT/usr \
 	perl=%{_bindir}/perl \
-	docdir=$RPM_BUILD_ROOT/usr/share/doc/fonty-%{version}
+	docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
+install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/consolefonts
+
+rm -f doc/pl/{DO_ZROBIENIA,ZMIANY}
+cp -a doc/en/TODO doc/pl/DO_ZROBIENIA
+cp -a doc/en/CHANGES doc/pl/ZMIANY
+
+gzip -9nf doc/en/* doc/pl/*
 
 %clean
 rm -rf $RPM_BUILD_ROOT