- removed qrczak.fallback (conflicts with console-data, useless with kbd)

[packages/fonty.git] / fonty.spec

diff --git a/fonty.spec b/fonty.spec
index d121e6558ba3a1508c3de793b206758e38838414..0960459bdc2cee2eea615e6f80103781c2dbebc5 100644 (file)
--- a/fonty.spec
+++ b/fonty.spec
@@ -1,64 +1,64 @@
-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 Linuksa
+Name:          fonty
+Version:       1.0
+Release:       5
+License:       GPL
+Group:         Applications/Text
+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/
+BuildRequires: perl
+Requires:      console-tools
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %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 fonty 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 Linuksa
+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="%{rpmcflags} %{!?debug:-fomit-frame-pointer}"
+OPTFLAGS="$OPTFLAGS -fno-rtti -fno-exceptions"
+%{__make} \
+       CXXFLAGS="$OPTFLAGS" \
+       consoleprefix=%{_prefix} \
+       konwertprefix=%{_prefix} \
        perl=/usr/bin/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 \
-       perl=/usr/bin/perl \
-       docdir=$RPM_BUILD_ROOT/usr/doc/fonty-%{version}
+%{__make} install \
+       consoleprefix=$RPM_BUILD_ROOT%{_prefix} \
+       konwertprefix=$RPM_BUILD_ROOT%{_prefix} \
+       perl=%{_bindir}/perl \
+       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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc %lang(en) doc/en
+%doc doc/en
 %doc %lang(pl) doc/pl
-/usr/share/consolefonts/*
-/usr/share/consoletrans/*
-%attr(755, root, root) %{_libdir}/konwert/aux/dynafont
-%attr(755, root, root) /usr/share/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
+%{_datadir}/consolefonts/*
+# consoletrans/qrczak.fallback conflicts with console-data
+# and is useless with kbd (kbd doesn't support fallback tables)
+#%{_datadir}/consoletrans/*
+%attr(755,root,root) %{_libdir}/konwert/aux/dynafont
+%attr(755,root,root) %{_datadir}/konwert/filters/dynafont