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

[packages/fonty.git] / fonty.spec

diff --git a/fonty.spec b/fonty.spec
index 5fa088ee413fc0970a38d8daaf26ebc530e14351..0960459bdc2cee2eea615e6f80103781c2dbebc5 100644 (file)
--- a/fonty.spec
+++ b/fonty.spec
@@ -1,42 +1,45 @@
 Summary:       Fonts on Linux console
-Summary(pl):   Fonty na konsoli Linuxa
+Summary(pl):   Fonty na konsoli Linuksa
 Name:          fonty
 Version:       1.0
-Release:       3
-Copyright:     GPL
-Group:         Utilities/Text
-Group(pl):     Narzêdzia/Tekst
-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/
+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:     /tmp/%{name}-%{version}-root
+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 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 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 \
-       perl=%{_bindir}/perl \
+OPTFLAGS="%{rpmcflags} %{!?debug:-fomit-frame-pointer}"
+OPTFLAGS="$OPTFLAGS -fno-rtti -fno-exceptions"
+%{__make} \
+       CXXFLAGS="$OPTFLAGS" \
+       consoleprefix=%{_prefix} \
+       konwertprefix=%{_prefix} \
+       perl=/usr/bin/perl \
        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%{_docdir}/%{name}-%{version}
 
@@ -46,16 +49,16 @@ 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
 
 %files
 %defattr(644,root,root,755)
-%doc %lang(en) doc/en
+%doc doc/en
 %doc %lang(pl) doc/pl
 %{_datadir}/consolefonts/*
-%{_datadir}/consoletrans/*
+# 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