X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=fonty.spec;h=93e70433ac3819ecef6b1d337f5a551d54a20034;hb=6fed6713d06a0d4c282595ad4cc7dfd12c5a4b50;hp=d95f4484672fccf9f9dbfad5443ff3c305a0fa67;hpb=73ff02d100d3862defa2b707b33f85c2bc8112e3;p=packages%2Ffonty.git

diff --git a/fonty.spec b/fonty.spec
index d95f448..93e7043 100644
--- a/fonty.spec
+++ b/fonty.spec
@@ -1,43 +1,58 @@
-Summary:     Fonts on Linux console
-Summary(pl): Fonty na konsoli Linuxa
-Name:	     fonty
-Version:     1.0
-Release:     1
-Copyright:   GPL
-Group:	     Utilities/Text
-Group(pl):   Narzêdzia/Tekst
-Source:	     http://qrczak.home.ml.org/programy/linux/%{name}/%{name}-%{version}.tar.gz
-URL:	     http://qrczak.home.ml.org/programy/linux/fonty/
-Requires:    console-tools
-BuildRoot:	/tmp/%{name}-%{version}-root
+Summary:	Fonts on Linux console
+Summary(pl):	Fonty na konsoli Linuxa
+Name:		fonty
+Version:	1.0
+Release:	4
+License:	GPL
+Group:		Applications/Text
+Group(de):	Applikationen/Text
+Group(fr):	Utilitaires/Texte
+Group(pl):	Aplikacje/Tekst
+Source0:	http://qrczak.ids.net.pl/programy/linux/%{name}/%{name}-%{version}.tar.gz
+Source1:	iso02grf.psf.gz
+URL:		http://qrczak.ids.net.pl/programy/linux/fonty/
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+BuildRequires:	perl
+Requires:	console-tools
 
 %description
 The Fonty package contains various fonts for Linux text console and
-dynafont - a tool which allows displaying texts containing thousands of
-different characters.
+dynafont - a tool which allows displaying texts containing thousands
+of different characters.
 
 %description -l pl
-Niniejszy pakiet zawiera ró¿ne czcionki dla konsoli tekstowej Linuxa oraz
-dynafont - narzêdzie pozwalaj±ce wy¶wietlaæ teksty zawieraj±ce tysi±ce
-ró¿nych znaków.
+Niniejszy pakiet zawiera ró¿ne czcionki dla konsoli tekstowej Linuxa
+oraz dynafont - narzêdzie pozwalaj±ce wy¶wietlaæ teksty zawieraj±ce
+tysi±ce ró¿nych znaków.
 
 %prep
 %setup -q
 
 %build
-CXXFLAGS=$RPM_OPT_FLAGS make \
-	consoleprefix=/usr \
-	konwertprefix=/usr \
+OPTFLAGS="%{?debug:-g -O}%{!?debug:$RPM_OPT_FLAGS -fomit-frame-pointer}"
+OPTFLAGS="$OPTFLAGS -fno-rtti -fno-exceptions"
+%{__make} \
+	CXXFLAGS="$OPTFLAGS" \
+	consoleprefix=%{_prefix} \
+	konwertprefix=%{_prefix} \
 	perl=%{_bindir}/perl \
-	docdir=/usr/doc/fonty-%{version}
+	docdir=%{_docdir}/%{name}-%{version}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install \
-	consoleprefix=$RPM_BUILD_ROOT/usr \
-	konwertprefix=$RPM_BUILD_ROOT/usr \
+%{__make} install \
+	consoleprefix=$RPM_BUILD_ROOT%{_prefix} \
+	konwertprefix=$RPM_BUILD_ROOT%{_prefix} \
 	perl=%{_bindir}/perl \
-	docdir=$RPM_BUILD_ROOT/usr/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
@@ -47,18 +62,5 @@ rm -rf $RPM_BUILD_ROOT
 %doc %lang(en) doc/en
 %doc %lang(pl) doc/pl
 %{_datadir}/consolefonts/*
-%{_datadir}/consoletrans/*
 %attr(755,root,root) %{_libdir}/konwert/aux/dynafont
 %attr(755,root,root) %{_datadir}/konwert/filters/dynafont
-
-%changelog
-* Tue Jan 26 1999 Micha³ Kuratczyk <kurkens@polbox.com>
-- added "Group(pl)"
-
-* Sat Nov 28 1998 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
-  [1.0-1]
-- simplification in %files,
-- removed "Prereq: perl".
-
-* Fri Sep 20 1998 Marcin 'Qrczak' Kowalczyk <qrczak@knm.org.pl>
-- First release in RPM