- 4.8.0 (probably the last XFree86 version ever, for comparison and archival reasons)

[packages/XFree86-fonts.git] / XFree86-fonts.spec

diff --git a/XFree86-fonts.spec b/XFree86-fonts.spec
index 5c3c5df51b7cf6cba02d0c338657d05c2e7ade19..fa2717af43098e23e1880bd6ee5f7cd3f3951ef8 100644 (file)
--- a/XFree86-fonts.spec
+++ b/XFree86-fonts.spec
@@ -1,30 +1,30 @@
 Summary:       XFree86 Fonts
-Summary(pl):   Fonty dla systemu XFree86
+Summary(pl.UTF-8):     Fonty dla systemu XFree86
 Name:          XFree86-fonts
-Version:       4.4.0
+Version:       4.8.0
 Release:       1
 License:       MIT
 Group:         Fonts
-#Source0:      ftp://ftp.xfree86.org/pub/XFree86/develsnaps/XFree86-%{version}.tar.bz2
 # We need source0 for arabic fonts
-Source0:       ftp://ftp.xfree86.org/pub/XFree86/%{version}/source/XFree86-%{version}-src-1.tgz
-# Source0-md5: 97cea3d9e1197dde32ca34e3b6086469
-Source1:       ftp://ftp.xfree86.org/pub/XFree86/%{version}/source/XFree86-%{version}-src-4.tgz
-# Source1-md5: 5d1792f5c154c7462c6aef39c7853b3b
-Source2:       ftp://ftp.xfree86.org/pub/XFree86/%{version}/source/XFree86-%{version}-src-5.tgz
-# Source2-md5: 5c37f028efc6d54a9c725e333f9cc8ae
-Source3:       http://www.biz.net.pl/images/ISO8859-2-bdf.tar.gz
-# Source3-md5: 5dd69ab949d833944048b10a97f7a589
-Source4:       %{name}.Fontmap
-Source5:       vga.pcf
+Source0:       http://ftp.xfree86.org/pub/XFree86/%{version}/source/XFree86-%{version}-src-1.tgz
+# Source0-md5: 42d802caf03cbaadfa3a69b887e9b203
+Source1:       http://ftp.xfree86.org/pub/XFree86/%{version}/source/XFree86-%{version}-src-4.tgz
+# Source1-md5: 2743099973f1bd3a73bcb7b05df0f279
+Source2:       http://ftp.xfree86.org/pub/XFree86/%{version}/source/XFree86-%{version}-src-5.tgz
+# Source2-md5: 236c807d4f426850f24784ccceec08ab
+Source3:       %{name}.Fontmap
 Patch0:                %{name}-extras-fix.patch
 Patch1:                %{name}-do_not_run_fccache.patch
-Patch2:                %{name}-ISO8859-2.patch
-Patch3:                %{name}-TTF_build.patch
-#BuildRequires:        XFree86 >= %{version}-1
-#BuildRequires:        XFree86-devel >= %{version}-1
-BuildRequires: XFree86
-BuildRequires: perl
+Patch2:                %{name}-TTF_build.patch
+# allow utils from X11R7
+%if %(test -x /usr/bin/bdftopcf ; echo $?)
+BuildRequires: XFree86-devel
+%else
+BuildRequires: xorg-app-bdftopcf
+BuildRequires: xorg-cf-files
+BuildRequires: xorg-util-imake
+%endif
+BuildRequires: perl-base
 BuildRequires: t1utils
 Requires(post,postun): fontpostinst
 Requires:      %{name}-base = %{version}
@@ -39,42 +39,48 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _t1afmdir       %{_t1fontsdir}/afm
 %define                _t1pfmdir       %{_t1fontsdir}/pfm
 
+%if %(test -d /usr/%{_lib}/X11/config ; echo $?)
+%define                xconfdir        %{_prefix}/lib/X11/config
+%else
+%define                xconfdir        /usr/%{_lib}/X11/config
+%endif
+
 %description
 This package contains some common used fonts. Normally fonts are
 needed only by X server (either locally to server or through xfs).
 
-%description -l pl
-Pakiet ten zawiera czêsto u¿ywane fonty. Zwykle fonty s± potrzebne
+%description -l pl.UTF-8
+Pakiet ten zawiera często używane fonty. Zwykle fonty są potrzebne
 tylko dla X serwera (lokalnie dla serwera lub poprzez xfs).
 
 %package utils
 Summary:       Perl scripts for generating BDF fonts
-Summary(pl):   Skrypty perlowe do generowania fontów BDF
-Group:         X11/XFree86
+Summary(pl.UTF-8):     Skrypty perlowe do generowania fontów BDF
+Group:         X11
 
 %description utils
 Perl scripts that allow to generate from an ISO10646-1 encoded BDF
 font other BDF fonts in any possible encoding.
 
-%description utils -l pl
-Skrypty perlowe pozwalaj±ce wygenerowaæ z fontów BDF kodowanych w
+%description utils -l pl.UTF-8
+Skrypty perlowe pozwalające wygenerować z fontów BDF kodowanych w
 ISO10646-1 fonty BDF z dowolnym kodowaniem.
 
 %package base
 Summary:       Base fonts (cursor and fixed)
-Summary(pl):   Podstawowe fonty (cursor i fixed)
+Summary(pl.UTF-8):     Podstawowe fonty (cursor i fixed)
 Group:         Fonts
 Requires(post,postun): fontpostinst
 
 %description base
 Base fonts (cursor and fixed) needed to start X server.
 
-%description base -l pl
-Podstawowe fonty (cursor i fixed) niezbêdne do uruchomienia X serwera.
+%description base -l pl.UTF-8
+Podstawowe fonty (cursor i fixed) niezbędne do uruchomienia X serwera.
 
 %package ISO8859-1
 Summary:       ISO-8859-1 basic raster fonts
-Summary(pl):   Podstawowe fonty rastrowe ISO-8859-1
+Summary(pl.UTF-8):     Podstawowe fonty rastrowe ISO-8859-1
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/misc
@@ -82,12 +88,12 @@ Requires:   %{_fontsdir}/misc
 %description ISO8859-1
 ISO-8859-1 basic raster fonts.
 
-%description ISO8859-1 -l pl
+%description ISO8859-1 -l pl.UTF-8
 Podstawowe fonty rastrowe ISO-8859-1.
 
 %package ISO8859-2
 Summary:       ISO-8859-2 basic raster fonts
-Summary(pl):   Podstawowe fonty rastrowe ISO-8859-2
+Summary(pl.UTF-8):     Podstawowe fonty rastrowe ISO-8859-2
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/misc
@@ -95,12 +101,12 @@ Requires:  %{_fontsdir}/misc
 %description ISO8859-2
 ISO-8859-2 basic raster fonts.
 
-%description ISO8859-2 -l pl
+%description ISO8859-2 -l pl.UTF-8
 Podstawowe fonty rastrowe ISO-8859-2.
 
 %package ISO8859-3
 Summary:       ISO-8859-3 basic raster fonts
-Summary(pl):   Podstawowe fonty rastrowe ISO-8859-3
+Summary(pl.UTF-8):     Podstawowe fonty rastrowe ISO-8859-3
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/misc
@@ -108,12 +114,12 @@ Requires: %{_fontsdir}/misc
 %description ISO8859-3
 ISO-8859-3 basic raster fonts.
 
-%description ISO8859-3 -l pl
+%description ISO8859-3 -l pl.UTF-8
 Podstawowe fonty rastrowe ISO-8859-3.
 
 %package ISO8859-4
 Summary:       ISO-8859-4 basic raster fonts
-Summary(pl):   Podstawowe fonty rastrowe ISO-8859-4
+Summary(pl.UTF-8):     Podstawowe fonty rastrowe ISO-8859-4
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/misc
@@ -121,12 +127,12 @@ Requires: %{_fontsdir}/misc
 %description ISO8859-4
 ISO-8859-4 basic raster fonts.
 
-%description ISO8859-4 -l pl
+%description ISO8859-4 -l pl.UTF-8
 Podstawowe fonty rastrowe ISO-8859-4.
 
 %package ISO8859-5
 Summary:       ISO-8859-5 basic raster fonts
-Summary(pl):   Podstawowe fonty rastrowe ISO-8859-5
+Summary(pl.UTF-8):     Podstawowe fonty rastrowe ISO-8859-5
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/misc
@@ -134,12 +140,12 @@ Requires: %{_fontsdir}/misc
 %description ISO8859-5
 Basic ISO-8859-5 raster fonts.
 
-%description ISO8859-5 -l pl
+%description ISO8859-5 -l pl.UTF-8
 Podstawowe fonty rastrowe ISO-8859-5.
 
 %package ISO8859-6
 Summary:       ISO-8859-6 basic raster fonts
-Summary(pl):   Podstawowe fonty rastrowe ISO-8859-6
+Summary(pl.UTF-8):     Podstawowe fonty rastrowe ISO-8859-6
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/misc
@@ -147,12 +153,12 @@ Requires: %{_fontsdir}/misc
 %description ISO8859-6
 ISO-8859-6 basic raster fonts.
 
-%description ISO8859-6 -l pl
+%description ISO8859-6 -l pl.UTF-8
 Podstawowe fonty rastrowe ISO-8859-6.
 
 %package ISO8859-7
 Summary:       ISO-8859-7 basic raster fonts
-Summary(pl):   Podstawowe fonty rastrowe ISO-8859-7
+Summary(pl.UTF-8):     Podstawowe fonty rastrowe ISO-8859-7
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/misc
@@ -160,12 +166,12 @@ Requires: %{_fontsdir}/misc
 %description ISO8859-7
 ISO-8859-7 basic raster fonts.
 
-%description ISO8859-7 -l pl
+%description ISO8859-7 -l pl.UTF-8
 Podstawowe fonty rastrowe ISO-8859-7.
 
 %package ISO8859-8
 Summary:       ISO-8859-8 basic raster fonts
-Summary(pl):   Podstawowe fonty rastrowe ISO-8859-8
+Summary(pl.UTF-8):     Podstawowe fonty rastrowe ISO-8859-8
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/misc
@@ -173,12 +179,12 @@ Requires: %{_fontsdir}/misc
 %description ISO8859-8
 ISO-8859-8 basic raster fonts.
 
-%description ISO8859-8 -l pl
+%description ISO8859-8 -l pl.UTF-8
 Podstawowe fonty rastrowe ISO-8859-8.
 
 %package ISO8859-9
 Summary:       ISO-8859-9 basic raster fonts
-Summary(pl):   Podstawowe fonty rastrowe ISO-8859-9
+Summary(pl.UTF-8):     Podstawowe fonty rastrowe ISO-8859-9
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/misc
@@ -186,12 +192,12 @@ Requires: %{_fontsdir}/misc
 %description ISO8859-9
 ISO-8859-9 basic raster fonts.
 
-%description ISO8859-9 -l pl
+%description ISO8859-9 -l pl.UTF-8
 Podstawowe fonty rastrowe ISO-8859-9.
 
 %package ISO8859-10
 Summary:       ISO-8859-10 basic raster fonts
-Summary(pl):   Podstawowe fonty rastrowe ISO-8859-10
+Summary(pl.UTF-8):     Podstawowe fonty rastrowe ISO-8859-10
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/misc
@@ -199,12 +205,12 @@ Requires: %{_fontsdir}/misc
 %description ISO8859-10
 ISO-8859-10 basic raster fonts.
 
-%description ISO8859-10 -l pl
+%description ISO8859-10 -l pl.UTF-8
 Podstawowe fonty rastrowe ISO-8859-10.
 
 %package ISO8859-11
 Summary:       ISO-8859-11 basic raster fonts
-Summary(pl):   Podstawowe fonty rastrowe ISO-8859-11
+Summary(pl.UTF-8):     Podstawowe fonty rastrowe ISO-8859-11
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/misc
@@ -212,12 +218,12 @@ Requires: %{_fontsdir}/misc
 %description ISO8859-11
 ISO-8859-11 basic raster fonts.
 
-%description ISO8859-11 -l pl
+%description ISO8859-11 -l pl.UTF-8
 Podstawowe fonty rastrowe ISO-8859-11.
 
 %package ISO8859-12
 Summary:       ISO-8859-12 basic raster fonts
-Summary(pl):   Podstawowe fonty rastrowe ISO-8859-12
+Summary(pl.UTF-8):     Podstawowe fonty rastrowe ISO-8859-12
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/misc
@@ -225,12 +231,12 @@ Requires: %{_fontsdir}/misc
 %description ISO8859-12
 ISO-8859-12 basic raster fonts.
 
-%description ISO8859-12 -l pl
+%description ISO8859-12 -l pl.UTF-8
 Podstawowe fonty rastrowe ISO-8859-12.
 
 %package ISO8859-13
 Summary:       ISO-8859-13 basic raster fonts
-Summary(pl):   Podstawowe fonty rastrowe ISO-8859-13
+Summary(pl.UTF-8):     Podstawowe fonty rastrowe ISO-8859-13
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/misc
@@ -238,12 +244,12 @@ Requires: %{_fontsdir}/misc
 %description ISO8859-13
 ISO-8859-13 basic raster fonts.
 
-%description ISO8859-13 -l pl
+%description ISO8859-13 -l pl.UTF-8
 Podstawowe fonty rastrowe ISO-8859-13.
 
 %package ISO8859-14
 Summary:       ISO-8859-14 basic raster fonts
-Summary(pl):   Podstawowe fonty rastrowe ISO-8859-14
+Summary(pl.UTF-8):     Podstawowe fonty rastrowe ISO-8859-14
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/misc
@@ -251,12 +257,12 @@ Requires: %{_fontsdir}/misc
 %description ISO8859-14
 ISO-8859-14 basic raster fonts.
 
-%description ISO8859-14 -l pl
+%description ISO8859-14 -l pl.UTF-8
 Podstawowe fonty rastrowe ISO-8859-14.
 
 %package ISO8859-15
 Summary:       ISO-8859-15 basic raster fonts
-Summary(pl):   Podstawowe fonty rastrowe ISO-8859-15
+Summary(pl.UTF-8):     Podstawowe fonty rastrowe ISO-8859-15
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/misc
@@ -264,12 +270,12 @@ Requires: %{_fontsdir}/misc
 %description ISO8859-15
 ISO-8859-15 basic raster fonts.
 
-%description ISO8859-15 -l pl
+%description ISO8859-15 -l pl.UTF-8
 Podstawowe fonty rastrowe ISO-8859-15.
 
 %package ISO8859-16
 Summary:       ISO-8859-16 basic raster fonts
-Summary(pl):   Podstawowe fonty rastrowe ISO-8859-16
+Summary(pl.UTF-8):     Podstawowe fonty rastrowe ISO-8859-16
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/misc
@@ -277,12 +283,12 @@ Requires: %{_fontsdir}/misc
 %description ISO8859-16
 ISO-8859-16 basic raster fonts.
 
-%description ISO8859-16 -l pl
+%description ISO8859-16 -l pl.UTF-8
 Podstawowe fonty rastrowe ISO-8859-16.
 
 %package JISX0201.1976-0
 Summary:       JISX0201.1976-0 basic raster fonts
-Summary(pl):   Podstawowe fonty rastrowe JISX0201.1976-0
+Summary(pl.UTF-8):     Podstawowe fonty rastrowe JISX0201.1976-0
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/misc
@@ -290,12 +296,12 @@ Requires: %{_fontsdir}/misc
 %description JISX0201.1976-0
 JISX0201.1976-0 basic raster fonts.
 
-%description JISX0201.1976-0 -l pl
+%description JISX0201.1976-0 -l pl.UTF-8
 Podstawowe fonty rastrowe JISX0201.1976-0.
 
 %package KOI8-R
 Summary:       KOI8-R (cyrillic) raster fonts
-Summary(pl):   Fonty rastrowe KOI8-R (cyrylica)
+Summary(pl.UTF-8):     Fonty rastrowe KOI8-R (cyrylica)
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/misc
@@ -304,15 +310,15 @@ Obsoletes:        XFree86-cyrillic-fonts
 %description KOI8-R
 KOI8-R (cyrillic) raster fonts.
 
-%description KOI8-R -l pl
+%description KOI8-R -l pl.UTF-8
 Fonty rastrowe KOI8-R (cyrylica).
 
 %package 75dpi
 Summary:       X11R6 75dpi raster fonts
-Summary(de):   X11R6 75 dpi-Fonts
-Summary(fr):   Fontes 75 dpi X11R6
-Summary(pl):   Fonty rastrowe o rozdzielczo¶ci 75dpi
-Summary(tr):   X11R6 75dpi yazýtipleri
+Summary(de.UTF-8):     X11R6 75 dpi-Fonts
+Summary(fr.UTF-8):     Fontes 75 dpi X11R6
+Summary(pl.UTF-8):     Fonty rastrowe o rozdzielczości 75dpi
+Summary(tr.UTF-8):     X11R6 75dpi yazıtipleri
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Obsoletes:     XFree86-75dpi-fonts
@@ -324,28 +330,28 @@ Obsoletes:        X11R6.1-75dpi-fonts
 The 75dpi fonts used on most Linux systems. Users with high resolution
 displays may prefer the 100dpi fonts available in a separate package.
 
-%description 75dpi -l de
-Die 75dpi-Fonts, die auf meisten Linux-Systemen verwendet werden. Für
-Benutzer mit einer hochauflösender Darstellung sind die 100dpi-Fonts
-eines getrennt erhältlichen Pakets besser geeignet.
+%description 75dpi -l de.UTF-8
+Die 75dpi-Fonts, die auf meisten Linux-Systemen verwendet werden. Für
+Benutzer mit einer hochauflösender Darstellung sind die 100dpi-Fonts
+eines getrennt erhältlichen Pakets besser geeignet.
 
-%description 75dpi -l fr
-Fontes 75 dpi utilisées sur la plupart des systèmes Linux. Ceux qui
-ont des écrans à haute résolution préfèreront les fontes 100 dpi
+%description 75dpi -l fr.UTF-8
+Fontes 75 dpi utilisées sur la plupart des systèmes Linux. Ceux qui
+ont des écrans à haute résolution préfèreront les fontes 100 dpi
 disponibles dans un autre paquetage.
 
-%description 75dpi -l pl
-Pakiet ten zawiera fonty rastrowe 75dpi. W wypadku wiêkszej
-rozdzielczo¶ci zalecane s± fonty 100dpi, które s± dostêpne w osobnym
+%description 75dpi -l pl.UTF-8
+Pakiet ten zawiera fonty rastrowe 75dpi. W wypadku większej
+rozdzielczości zalecane są fonty 100dpi, które są dostępne w osobnym
 pakiecie.
 
-%description 75dpi -l tr
-Çoðu Linux sisteminde 75dpi yazýtipi kullanýlýr. Yüksek çözünürlük
-kullanan kullanýcýlar 100dpi yazýtiplerini yeðleyebilirler.
+%description 75dpi -l tr.UTF-8
+Çoğu Linux sisteminde 75dpi yazıtipi kullanılır. Yüksek çözünürlük
+kullanan kullanıcılar 100dpi yazıtiplerini yeğleyebilirler.
 
 %package 75dpi-ISO8859-1
 Summary:       ISO-8859-1 75dpi raster fonts
-Summary(pl):   Fonty rastrowe ISO-8859-1 o rozdzielczo¶ci 75dpi
+Summary(pl.UTF-8):     Fonty rastrowe ISO-8859-1 o rozdzielczości 75dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/75dpi
@@ -353,12 +359,12 @@ Requires: %{_fontsdir}/75dpi
 %description 75dpi-ISO8859-1
 ISO-8859-1 75dpi raster fonts.
 
-%description 75dpi-ISO8859-1 -l pl
-Fonty rastrowe ISO-8859-1 o rozdzielczo¶ci 75dpi.
+%description 75dpi-ISO8859-1 -l pl.UTF-8
+Fonty rastrowe ISO-8859-1 o rozdzielczości 75dpi.
 
 %package 75dpi-ISO8859-2
 Summary:       ISO-8859-2 75dpi raster fonts
-Summary(pl):   Fonty rastrowe ISO-8859-2 o rozdzielczo¶ci 75dpi
+Summary(pl.UTF-8):     Fonty rastrowe ISO-8859-2 o rozdzielczości 75dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/75dpi
@@ -368,12 +374,12 @@ Obsoletes:        XFree86-latin2-75dpi-fonts
 %description 75dpi-ISO8859-2
 ISO-8859-2 75dpi raster fonts.
 
-%description 75dpi-ISO8859-2 -l pl
-Fonty rastrowe ISO-8859-2 o rozdzielczo¶ci 75dpi.
+%description 75dpi-ISO8859-2 -l pl.UTF-8
+Fonty rastrowe ISO-8859-2 o rozdzielczości 75dpi.
 
 %package 75dpi-ISO8859-3
 Summary:       ISO-8859-3 75dpi raster fonts
-Summary(pl):   Fonty rastrowe ISO-8859-3 o rozdzielczo¶ci 75dpi
+Summary(pl.UTF-8):     Fonty rastrowe ISO-8859-3 o rozdzielczości 75dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/75dpi
@@ -381,12 +387,12 @@ Requires: %{_fontsdir}/75dpi
 %description 75dpi-ISO8859-3
 ISO-8859-3 75dpi raster fonts.
 
-%description 75dpi-ISO8859-3 -l pl
-Fonty rastrowe ISO-8859-3 o rozdzielczo¶ci 75dpi.
+%description 75dpi-ISO8859-3 -l pl.UTF-8
+Fonty rastrowe ISO-8859-3 o rozdzielczości 75dpi.
 
 %package 75dpi-ISO8859-4
 Summary:       ISO-8859-4 75dpi raster fonts
-Summary(pl):   Fonty rastrowe ISO-8859-4 o rozdzielczo¶ci 75dpi
+Summary(pl.UTF-8):     Fonty rastrowe ISO-8859-4 o rozdzielczości 75dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/75dpi
@@ -394,12 +400,12 @@ Requires: %{_fontsdir}/75dpi
 %description 75dpi-ISO8859-4
 ISO-8859-4 75dpi raster fonts.
 
-%description 75dpi-ISO8859-4 -l pl
-Fonty rastrowe ISO-8859-4 o rozdzielczo¶ci 75dpi.
+%description 75dpi-ISO8859-4 -l pl.UTF-8
+Fonty rastrowe ISO-8859-4 o rozdzielczości 75dpi.
 
 %package 75dpi-ISO8859-5
 Summary:       ISO-8859-5 75dpi raster fonts
-Summary(pl):   Fonty rastrowe ISO-8859-5 o rozdzielczo¶ci 75dpi
+Summary(pl.UTF-8):     Fonty rastrowe ISO-8859-5 o rozdzielczości 75dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/75dpi
@@ -407,12 +413,12 @@ Requires: %{_fontsdir}/75dpi
 %description 75dpi-ISO8859-5
 ISO-8859-5 75dpi raster fonts.
 
-%description 75dpi-ISO8859-5 -l pl
-Fonty rastrowe ISO-8859-5 o rozdzielczo¶ci 75dpi.
+%description 75dpi-ISO8859-5 -l pl.UTF-8
+Fonty rastrowe ISO-8859-5 o rozdzielczości 75dpi.
 
 %package 75dpi-ISO8859-6
 Summary:       ISO-8859-6 75dpi raster fonts
-Summary(pl):   Fonty rastrowe ISO-8859-6 o rozdzielczo¶ci 75dpi
+Summary(pl.UTF-8):     Fonty rastrowe ISO-8859-6 o rozdzielczości 75dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/75dpi
@@ -420,12 +426,12 @@ Requires: %{_fontsdir}/75dpi
 %description 75dpi-ISO8859-6
 ISO-8859-6 75dpi raster fonts.
 
-%description 75dpi-ISO8859-6 -l pl
-Fonty rastrowe ISO-8859-6 o rozdzielczo¶ci 75dpi.
+%description 75dpi-ISO8859-6 -l pl.UTF-8
+Fonty rastrowe ISO-8859-6 o rozdzielczości 75dpi.
 
 %package 75dpi-ISO8859-7
 Summary:       ISO-8859-7 75dpi raster fonts
-Summary(pl):   Fonty rastrowe ISO-8859-7 o rozdzielczo¶ci 75dpi
+Summary(pl.UTF-8):     Fonty rastrowe ISO-8859-7 o rozdzielczości 75dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/75dpi
@@ -433,12 +439,12 @@ Requires: %{_fontsdir}/75dpi
 %description 75dpi-ISO8859-7
 ISO-8859-7 75dpi raster fonts.
 
-%description 75dpi-ISO8859-7 -l pl
-Fonty rastrowe ISO-8859-7 o rozdzielczo¶ci 75dpi.
+%description 75dpi-ISO8859-7 -l pl.UTF-8
+Fonty rastrowe ISO-8859-7 o rozdzielczości 75dpi.
 
 %package 75dpi-ISO8859-8
 Summary:       ISO-8859-8 75dpi raster fonts
-Summary(pl):   Fonty rastrowe ISO-8859-8 o rozdzielczo¶ci 75dpi
+Summary(pl.UTF-8):     Fonty rastrowe ISO-8859-8 o rozdzielczości 75dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/75dpi
@@ -446,12 +452,12 @@ Requires: %{_fontsdir}/75dpi
 %description 75dpi-ISO8859-8
 ISO-8859-8 75dpi raster fonts.
 
-%description 75dpi-ISO8859-8 -l pl
-Fonty rastrowe ISO-8859-8 o rozdzielczo¶ci 75dpi.
+%description 75dpi-ISO8859-8 -l pl.UTF-8
+Fonty rastrowe ISO-8859-8 o rozdzielczości 75dpi.
 
 %package 75dpi-ISO8859-9
 Summary:       ISO-8859-9 75dpi raster fonts
-Summary(pl):   Fonty rastrowe ISO-8859-9 o rozdzielczo¶ci 75dpi
+Summary(pl.UTF-8):     Fonty rastrowe ISO-8859-9 o rozdzielczości 75dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/75dpi
@@ -459,12 +465,12 @@ Requires: %{_fontsdir}/75dpi
 %description 75dpi-ISO8859-9
 ISO-8859-9 75dpi raster fonts.
 
-%description 75dpi-ISO8859-9 -l pl
-Fonty rastrowe ISO-8859-9 o rozdzielczo¶ci 75dpi.
+%description 75dpi-ISO8859-9 -l pl.UTF-8
+Fonty rastrowe ISO-8859-9 o rozdzielczości 75dpi.
 
 %package 75dpi-ISO8859-10
 Summary:       ISO-8859-10 75dpi raster fonts
-Summary(pl):   Fonty rastrowe ISO-8859-10 o rozdzielczo¶ci 75dpi
+Summary(pl.UTF-8):     Fonty rastrowe ISO-8859-10 o rozdzielczości 75dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/75dpi
@@ -472,12 +478,12 @@ Requires: %{_fontsdir}/75dpi
 %description 75dpi-ISO8859-10
 ISO-8859-10 75dpi raster fonts.
 
-%description 75dpi-ISO8859-10 -l pl
-Fonty rastrowe ISO-8859-10 o rozdzielczo¶ci 75dpi.
+%description 75dpi-ISO8859-10 -l pl.UTF-8
+Fonty rastrowe ISO-8859-10 o rozdzielczości 75dpi.
 
 %package 75dpi-ISO8859-11
 Summary:       ISO-8859-11 75dpi raster fonts
-Summary(pl):   Fonty rastrowe ISO-8859-11 o rozdzielczo¶ci 75dpi
+Summary(pl.UTF-8):     Fonty rastrowe ISO-8859-11 o rozdzielczości 75dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/75dpi
@@ -485,12 +491,12 @@ Requires: %{_fontsdir}/75dpi
 %description 75dpi-ISO8859-11
 ISO-8859-11 75dpi raster fonts.
 
-%description 75dpi-ISO8859-11 -l pl
-Fonty rastrowe ISO-8859-11 o rozdzielczo¶ci 75dpi.
+%description 75dpi-ISO8859-11 -l pl.UTF-8
+Fonty rastrowe ISO-8859-11 o rozdzielczości 75dpi.
 
 %package 75dpi-ISO8859-12
 Summary:       ISO-8859-12 75dpi raster fonts
-Summary(pl):   Fonty rastrowe ISO-8859-12 o rozdzielczo¶ci 75dpi
+Summary(pl.UTF-8):     Fonty rastrowe ISO-8859-12 o rozdzielczości 75dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/75dpi
@@ -498,12 +504,12 @@ Requires: %{_fontsdir}/75dpi
 %description 75dpi-ISO8859-12
 ISO-8859-12 75dpi raster fonts.
 
-%description 75dpi-ISO8859-12 -l pl
-Fonty rastrowe ISO-8859-12 o rozdzielczo¶ci 75dpi.
+%description 75dpi-ISO8859-12 -l pl.UTF-8
+Fonty rastrowe ISO-8859-12 o rozdzielczości 75dpi.
 
 %package 75dpi-ISO8859-13
 Summary:       ISO-8859-13 75dpi raster fonts
-Summary(pl):   Fonty rastrowe ISO-8859-13 o rozdzielczo¶ci 75dpi
+Summary(pl.UTF-8):     Fonty rastrowe ISO-8859-13 o rozdzielczości 75dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/75dpi
@@ -511,12 +517,12 @@ Requires: %{_fontsdir}/75dpi
 %description 75dpi-ISO8859-13
 ISO-8859-13 75dpi raster fonts.
 
-%description 75dpi-ISO8859-13 -l pl
-Fonty rastrowe ISO-8859-13 o rozdzielczo¶ci 75dpi.
+%description 75dpi-ISO8859-13 -l pl.UTF-8
+Fonty rastrowe ISO-8859-13 o rozdzielczości 75dpi.
 
 %package 75dpi-ISO8859-14
 Summary:       ISO-8859-14 75dpi raster fonts
-Summary(pl):   Fonty rastrowe ISO-8859-14 o rozdzielczo¶ci 75dpi
+Summary(pl.UTF-8):     Fonty rastrowe ISO-8859-14 o rozdzielczości 75dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/75dpi
@@ -524,12 +530,12 @@ Requires: %{_fontsdir}/75dpi
 %description 75dpi-ISO8859-14
 ISO-8859-14 75dpi raster fonts.
 
-%description 75dpi-ISO8859-14 -l pl
-Fonty rastrowe ISO-8859-14 o rozdzielczo¶ci 75dpi.
+%description 75dpi-ISO8859-14 -l pl.UTF-8
+Fonty rastrowe ISO-8859-14 o rozdzielczości 75dpi.
 
 %package 75dpi-ISO8859-15
 Summary:       ISO-8859-15 75dpi raster fonts
-Summary(pl):   Fonty rastrowe ISO-8859-15 o rozdzielczo¶ci 75dpi
+Summary(pl.UTF-8):     Fonty rastrowe ISO-8859-15 o rozdzielczości 75dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/75dpi
@@ -537,12 +543,12 @@ Requires: %{_fontsdir}/75dpi
 %description 75dpi-ISO8859-15
 ISO-8859-15 75dpi raster fonts.
 
-%description 75dpi-ISO8859-15 -l pl
-Fonty rastrowe ISO-8859-15 o rozdzielczo¶ci 75dpi.
+%description 75dpi-ISO8859-15 -l pl.UTF-8
+Fonty rastrowe ISO-8859-15 o rozdzielczości 75dpi.
 
 %package 75dpi-JISX0201.1976-0
 Summary:       JISX0201.1976-0 75dpi raster fonts
-Summary(pl):   Fonty rastrowe JISX0201.1976-0 o rozdzielczo¶ci 75dpi
+Summary(pl.UTF-8):     Fonty rastrowe JISX0201.1976-0 o rozdzielczości 75dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/75dpi
@@ -550,12 +556,12 @@ Requires: %{_fontsdir}/75dpi
 %description 75dpi-JISX0201.1976-0
 JISX0201.1976-0 75dpi raster fonts.
 
-%description 75dpi-JISX0201.1976-0 -l pl
-Fonty rastrowe JISX0201.1976-0 o rozdzielczo¶ci 75dpi.
+%description 75dpi-JISX0201.1976-0 -l pl.UTF-8
+Fonty rastrowe JISX0201.1976-0 o rozdzielczości 75dpi.
 
 %package 75dpi-KOI8-R
 Summary:       KOI8-R 75dpi raster fonts
-Summary(pl):   Fonty rastrowe KOI8-R o rozdzielczo¶ci 75dpi
+Summary(pl.UTF-8):     Fonty rastrowe KOI8-R o rozdzielczości 75dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/75dpi
@@ -563,15 +569,15 @@ Requires: %{_fontsdir}/75dpi
 %description 75dpi-KOI8-R
 KOI8-R 75dpi raster fonts.
 
-%description 75dpi-KOI8-R -l pl
-Fonty rastrowe ISO-KOI8-R o rozdzielczo¶ci 75dpi.
+%description 75dpi-KOI8-R -l pl.UTF-8
+Fonty rastrowe ISO-KOI8-R o rozdzielczości 75dpi.
 
 %package 100dpi
 Summary:       X11R6 100dpi raster fonts
-Summary(de):   X11R6 100dpi-Fonts
-Summary(fr):   Fontes 100ppp pour X11R6
-Summary(pl):   Fonty rastrowe o rozdzielczo¶ci 100dpi
-Summary(tr):   X11R6 100dpi yazýtipleri
+Summary(de.UTF-8):     X11R6 100dpi-Fonts
+Summary(fr.UTF-8):     Fontes 100ppp pour X11R6
+Summary(pl.UTF-8):     Fonty rastrowe o rozdzielczości 100dpi
+Summary(tr.UTF-8):     X11R6 100dpi yazıtipleri
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Obsoletes:     XFree86-100dpi-fonts
@@ -583,28 +589,28 @@ Obsoletes:        X11R6.1-100dpi-fonts
 The 100dpi fonts used on most Linux systems. Users with low resolution
 displays may prefer the 75dpi fonts available in a separate package.
 
-%description 100dpi -l de
+%description 100dpi -l de.UTF-8
 Die 100dpi-Schriftarten, die auf den meisten Linux-Systemen zum
-Einsatz kommen. Anwender mit hochauflösenden Monitoren ziehen unter
-Umständen die 100dpi-Schriften vor, die in einem separaten Paket
-erhältlich sind.
+Einsatz kommen. Anwender mit hochauflösenden Monitoren ziehen unter
+Umständen die 100dpi-Schriften vor, die in einem separaten Paket
+erhältlich sind.
 
-%description 100dpi -l fr
-Les fontes 100dpi sont utilisées par la plupart des systèmes Linux.
-Les utilisateurs ayant des hautes résolutions peuvent préférer les
-fontes 100dpi disponibles dans un package séparé.
+%description 100dpi -l fr.UTF-8
+Les fontes 100dpi sont utilisées par la plupart des systèmes Linux.
+Les utilisateurs ayant des hautes résolutions peuvent préférer les
+fontes 100dpi disponibles dans un package séparé.
 
-%description 100dpi -l pl
-Pakiet ten zawiera fonty rastrowe 100dpi. Bed± one potrzebne przy
-pracy w du¿ych rozdzielczo¶ciach.
+%description 100dpi -l pl.UTF-8
+Pakiet ten zawiera fonty rastrowe 100dpi. Bedą one potrzebne przy
+pracy w dużych rozdzielczościach.
 
-%description 100dpi -l tr
-Yüksek çözünürlük kullanan kullanýcýlar 100dpi yazýtiplerini 75dpi
-olanlara yeðleyebilirler.
+%description 100dpi -l tr.UTF-8
+Yüksek çözünürlük kullanan kullanıcılar 100dpi yazıtiplerini 75dpi
+olanlara yeğleyebilirler.
 
 %package 100dpi-ISO8859-1
 Summary:       ISO-8859-1 100dpi raster fonts
-Summary(pl):   Fonty rastrowe ISO-8859-1 o rozdzielczo¶ci 100dpi
+Summary(pl.UTF-8):     Fonty rastrowe ISO-8859-1 o rozdzielczości 100dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/100dpi
@@ -612,12 +618,12 @@ Requires: %{_fontsdir}/100dpi
 %description 100dpi-ISO8859-1
 ISO-8859-1 100dpi raster fonts.
 
-%description 100dpi-ISO8859-1 -l pl
-Fonty rastrowe ISO-8859-1 o rozdzielczo¶ci 100dpi.
+%description 100dpi-ISO8859-1 -l pl.UTF-8
+Fonty rastrowe ISO-8859-1 o rozdzielczości 100dpi.
 
 %package 100dpi-ISO8859-2
 Summary:       ISO-8859-2 100dpi raster fonts
-Summary(pl):   Fonty rastrowe ISO-8859-2 o rozdzielczo¶ci 100dpi
+Summary(pl.UTF-8):     Fonty rastrowe ISO-8859-2 o rozdzielczości 100dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/100dpi
@@ -627,12 +633,12 @@ Obsoletes:        XFree86-latin2-100dpi-fonts
 %description 100dpi-ISO8859-2
 ISO-8859-2 100dpi raster fonts.
 
-%description 100dpi-ISO8859-2 -l pl
-Fonty rastrowe ISO-8859-2 o rozdzielczo¶ci 100dpi.
+%description 100dpi-ISO8859-2 -l pl.UTF-8
+Fonty rastrowe ISO-8859-2 o rozdzielczości 100dpi.
 
 %package 100dpi-ISO8859-3
 Summary:       ISO-8859-3 100dpi raster fonts
-Summary(pl):   Fonty rastrowe ISO-8859-3 o rozdzielczo¶ci 100dpi
+Summary(pl.UTF-8):     Fonty rastrowe ISO-8859-3 o rozdzielczości 100dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/100dpi
@@ -640,12 +646,12 @@ Requires: %{_fontsdir}/100dpi
 %description 100dpi-ISO8859-3
 ISO-8859-3 100dpi raster fonts.
 
-%description 100dpi-ISO8859-3 -l pl
-Fonty rastrowe ISO-8859-3 o rozdzielczo¶ci 100dpi.
+%description 100dpi-ISO8859-3 -l pl.UTF-8
+Fonty rastrowe ISO-8859-3 o rozdzielczości 100dpi.
 
 %package 100dpi-ISO8859-4
 Summary:       ISO-8859-4 100dpi raster fonts
-Summary(pl):   Fonty rastrowe ISO-8859-4 o rozdzielczo¶ci 100dpi
+Summary(pl.UTF-8):     Fonty rastrowe ISO-8859-4 o rozdzielczości 100dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/100dpi
@@ -653,12 +659,12 @@ Requires: %{_fontsdir}/100dpi
 %description 100dpi-ISO8859-4
 ISO-8859-4 100dpi raster fonts.
 
-%description 100dpi-ISO8859-4 -l pl
-Fonty rastrowe ISO-8859-4 o rozdzielczo¶ci 100dpi.
+%description 100dpi-ISO8859-4 -l pl.UTF-8
+Fonty rastrowe ISO-8859-4 o rozdzielczości 100dpi.
 
 %package 100dpi-ISO8859-5
 Summary:       ISO-8859-5 100dpi raster fonts
-Summary(pl):   Fonty rastrowe ISO-8859-5 o rozdzielczo¶ci 100dpi
+Summary(pl.UTF-8):     Fonty rastrowe ISO-8859-5 o rozdzielczości 100dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/100dpi
@@ -666,12 +672,12 @@ Requires: %{_fontsdir}/100dpi
 %description 100dpi-ISO8859-5
 ISO-8859-5 100dpi raster fonts.
 
-%description 100dpi-ISO8859-5 -l pl
-Fonty rastrowe ISO-8859-5 o rozdzielczo¶ci 100dpi.
+%description 100dpi-ISO8859-5 -l pl.UTF-8
+Fonty rastrowe ISO-8859-5 o rozdzielczości 100dpi.
 
 %package 100dpi-ISO8859-6
 Summary:       ISO-8859-6 100dpi raster fonts
-Summary(pl):   Fonty rastrowe ISO-8859-6 o rozdzielczo¶ci 100dpi
+Summary(pl.UTF-8):     Fonty rastrowe ISO-8859-6 o rozdzielczości 100dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/100dpi
@@ -679,12 +685,12 @@ Requires: %{_fontsdir}/100dpi
 %description 100dpi-ISO8859-6
 ISO-8859-6 100dpi raster fonts.
 
-%description 100dpi-ISO8859-6 -l pl
-Fonty rastrowe ISO-8859-6 o rozdzielczo¶ci 100dpi.
+%description 100dpi-ISO8859-6 -l pl.UTF-8
+Fonty rastrowe ISO-8859-6 o rozdzielczości 100dpi.
 
 %package 100dpi-ISO8859-7
 Summary:       ISO-8859-7 100dpi raster fonts
-Summary(pl):   Fonty rastrowe ISO-8859-7 o rozdzielczo¶ci 100dpi
+Summary(pl.UTF-8):     Fonty rastrowe ISO-8859-7 o rozdzielczości 100dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/100dpi
@@ -692,12 +698,12 @@ Requires: %{_fontsdir}/100dpi
 %description 100dpi-ISO8859-7
 ISO-8859-7 100dpi raster fonts.
 
-%description 100dpi-ISO8859-7 -l pl
-Fonty rastrowe ISO-8859-7 o rozdzielczo¶ci 100dpi.
+%description 100dpi-ISO8859-7 -l pl.UTF-8
+Fonty rastrowe ISO-8859-7 o rozdzielczości 100dpi.
 
 %package 100dpi-ISO8859-8
 Summary:       ISO-8859-8 100dpi raster fonts
-Summary(pl):   Fonty rastrowe ISO-8859-8 o rozdzielczo¶ci 100dpi
+Summary(pl.UTF-8):     Fonty rastrowe ISO-8859-8 o rozdzielczości 100dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/100dpi
@@ -705,12 +711,12 @@ Requires: %{_fontsdir}/100dpi
 %description 100dpi-ISO8859-8
 ISO-8859-8 100dpi raster fonts.
 
-%description 100dpi-ISO8859-8 -l pl
-Fonty rastrowe ISO-8859-8 o rozdzielczo¶ci 100dpi.
+%description 100dpi-ISO8859-8 -l pl.UTF-8
+Fonty rastrowe ISO-8859-8 o rozdzielczości 100dpi.
 
 %package 100dpi-ISO8859-9
 Summary:       ISO-8859-9 100dpi raster fonts
-Summary(pl):   Fonty rastrowe ISO-8859-9 o rozdzielczo¶ci 100dpi
+Summary(pl.UTF-8):     Fonty rastrowe ISO-8859-9 o rozdzielczości 100dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/100dpi
@@ -718,12 +724,12 @@ Requires: %{_fontsdir}/100dpi
 %description 100dpi-ISO8859-9
 ISO-8859-9 100dpi raster fonts.
 
-%description 100dpi-ISO8859-9 -l pl
-Fonty rastrowe ISO-8859-9 o rozdzielczo¶ci 100dpi.
+%description 100dpi-ISO8859-9 -l pl.UTF-8
+Fonty rastrowe ISO-8859-9 o rozdzielczości 100dpi.
 
 %package 100dpi-ISO8859-10
 Summary:       ISO-8859-10 100dpi raster fonts
-Summary(pl):   Fonty rastrowe ISO-8859-10 o rozdzielczo¶ci 100dpi
+Summary(pl.UTF-8):     Fonty rastrowe ISO-8859-10 o rozdzielczości 100dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/100dpi
@@ -731,12 +737,12 @@ Requires: %{_fontsdir}/100dpi
 %description 100dpi-ISO8859-10
 ISO-8859-10 100dpi raster fonts.
 
-%description 100dpi-ISO8859-10 -l pl
-Fonty rastrowe ISO-8859-10 o rozdzielczo¶ci 100dpi.
+%description 100dpi-ISO8859-10 -l pl.UTF-8
+Fonty rastrowe ISO-8859-10 o rozdzielczości 100dpi.
 
 %package 100dpi-ISO8859-11
 Summary:       ISO-8859-11 100dpi raster fonts
-Summary(pl):   Fonty rastrowe ISO-8859-11 o rozdzielczo¶ci 100dpi
+Summary(pl.UTF-8):     Fonty rastrowe ISO-8859-11 o rozdzielczości 100dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/100dpi
@@ -744,12 +750,12 @@ Requires: %{_fontsdir}/100dpi
 %description 100dpi-ISO8859-11
 ISO-8859-11 100dpi raster fonts.
 
-%description 100dpi-ISO8859-11 -l pl
-Fonty rastrowe ISO-8859-11 o rozdzielczo¶ci 100dpi.
+%description 100dpi-ISO8859-11 -l pl.UTF-8
+Fonty rastrowe ISO-8859-11 o rozdzielczości 100dpi.
 
 %package 100dpi-ISO8859-12
 Summary:       ISO-8859-12 100dpi raster fonts
-Summary(pl):   Fonty rastrowe ISO-8859-12 o rozdzielczo¶ci 100dpi
+Summary(pl.UTF-8):     Fonty rastrowe ISO-8859-12 o rozdzielczości 100dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/100dpi
@@ -757,12 +763,12 @@ Requires: %{_fontsdir}/100dpi
 %description 100dpi-ISO8859-12
 ISO-8859-12 100dpi raster fonts.
 
-%description 100dpi-ISO8859-12 -l pl
-Fonty rastrowe ISO-8859-12 o rozdzielczo¶ci 100dpi.
+%description 100dpi-ISO8859-12 -l pl.UTF-8
+Fonty rastrowe ISO-8859-12 o rozdzielczości 100dpi.
 
 %package 100dpi-ISO8859-13
 Summary:       ISO-8859-13 100dpi raster fonts
-Summary(pl):   Fonty rastrowe ISO-8859-13 o rozdzielczo¶ci 100dpi
+Summary(pl.UTF-8):     Fonty rastrowe ISO-8859-13 o rozdzielczości 100dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/100dpi
@@ -770,12 +776,12 @@ Requires: %{_fontsdir}/100dpi
 %description 100dpi-ISO8859-13
 ISO-8859-13 100dpi raster fonts.
 
-%description 100dpi-ISO8859-13 -l pl
-Fonty rastrowe ISO-8859-13 o rozdzielczo¶ci 100dpi.
+%description 100dpi-ISO8859-13 -l pl.UTF-8
+Fonty rastrowe ISO-8859-13 o rozdzielczości 100dpi.
 
 %package 100dpi-ISO8859-14
 Summary:       ISO-8859-14 100dpi raster fonts
-Summary(pl):   Fonty rastrowe ISO-8859-14 o rozdzielczo¶ci 100dpi
+Summary(pl.UTF-8):     Fonty rastrowe ISO-8859-14 o rozdzielczości 100dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/100dpi
@@ -783,12 +789,12 @@ Requires: %{_fontsdir}/100dpi
 %description 100dpi-ISO8859-14
 ISO-8859-14 100dpi raster fonts.
 
-%description 100dpi-ISO8859-14 -l pl
-Fonty rastrowe ISO-8859-14 o rozdzielczo¶ci 100dpi.
+%description 100dpi-ISO8859-14 -l pl.UTF-8
+Fonty rastrowe ISO-8859-14 o rozdzielczości 100dpi.
 
 %package 100dpi-ISO8859-15
 Summary:       ISO-8859-15 100dpi raster fonts
-Summary(pl):   Fonty rastrowe ISO-8859-15 o rozdzielczo¶ci 100dpi
+Summary(pl.UTF-8):     Fonty rastrowe ISO-8859-15 o rozdzielczości 100dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/100dpi
@@ -796,12 +802,12 @@ Requires: %{_fontsdir}/100dpi
 %description 100dpi-ISO8859-15
 ISO-8859-15 100dpi raster fonts.
 
-%description 100dpi-ISO8859-15 -l pl
-Fonty rastrowe ISO-8859-15 o rozdzielczo¶ci 100dpi.
+%description 100dpi-ISO8859-15 -l pl.UTF-8
+Fonty rastrowe ISO-8859-15 o rozdzielczości 100dpi.
 
 %package 100dpi-JISX0201.1976-0
 Summary:       JISX0201.1976-0 100dpi raster fonts
-Summary(pl):   Fonty rastrowe JISX0201.1976-0 o rozdzielczo¶ci 100dpi
+Summary(pl.UTF-8):     Fonty rastrowe JISX0201.1976-0 o rozdzielczości 100dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/100dpi
@@ -809,12 +815,12 @@ Requires: %{_fontsdir}/100dpi
 %description 100dpi-JISX0201.1976-0
 JISX0201.1976-0 100dpi raster fonts.
 
-%description 100dpi-JISX0201.1976-0 -l pl
-Fonty rastrowe JISX0201.1976-0 o rozdzielczo¶ci 100dpi.
+%description 100dpi-JISX0201.1976-0 -l pl.UTF-8
+Fonty rastrowe JISX0201.1976-0 o rozdzielczości 100dpi.
 
 %package 100dpi-KOI8-R
 Summary:       KOI8-R 100dpi raster fonts
-Summary(pl):   Fonty rastrowe KOI8-R o rozdzielczo¶ci 100dpi
+Summary(pl.UTF-8):     Fonty rastrowe KOI8-R o rozdzielczości 100dpi
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/100dpi
@@ -822,12 +828,12 @@ Requires: %{_fontsdir}/100dpi
 %description 100dpi-KOI8-R
 KOI8-R 100dpi raster fonts.
 
-%description 100dpi-KOI8-R -l pl
-Fonty rastrowe KOI8-R o rozdzielczo¶ci 100dpi.
+%description 100dpi-KOI8-R -l pl.UTF-8
+Fonty rastrowe KOI8-R o rozdzielczości 100dpi.
 
 %package Ethiopic
 Summary:       Ethiopic OpenType and TrueType fonts
-Summary(pl):   Etiopskie fonty OpenType i TrueType
+Summary(pl.UTF-8):     Etiopskie fonty OpenType i TrueType
 Group:         Fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/OTF
@@ -836,12 +842,12 @@ Requires: %{_fontsdir}/TTF
 %description Ethiopic
 Ethiopic OpenType and TrueType fonts.
 
-%description Ethiopic -l pl
+%description Ethiopic -l pl.UTF-8
 Etiopskie fonty OpenType i TrueType.
 
 %package Syriac
 Summary:       Syriac OpenType fonts
-Summary(pl):   Starosyryjskie fonty OpenType
+Summary(pl.UTF-8):     Starosyryjskie fonty OpenType
 License:       distributable without modifications
 Group:         Fonts
 Requires(post,postun): fontpostinst
@@ -850,33 +856,25 @@ Requires: %{_fontsdir}/OTF
 %description Syriac
 Syriac OpenType fonts.
 
-%description Syriac -l pl
+%description Syriac -l pl.UTF-8
 Starosyryjskie fonty OpenType.
 
 %prep
-%setup -qc -a1 -a2 -a3
+%setup -qc -a1 -a2
 %patch0 -p0
 %patch1 -p0
 %patch2 -p1
-%patch3 -p1
 
 cp -f xc/extras/fonts/arabic24/*.bdf xc/fonts/bdf/misc
 cp -f xc/extras/fonts/ClearlyU/*.bdf xc/fonts/bdf/misc
 
-# move BIZNET ISO8859-2 fonts to main tree
-# (these fonts are still ISO8859-1 only in XFree86)
-for i in {misc/{12x24,8x16},{75,100}dpi/{char,term}}*.bdf ; do
-       j="`echo $i | sed 's/\.bdf$//'`-ISO8859-2.bdf"
-       mv -f $i xc/fonts/bdf/$j
-done
-
 %build
 cd xc/fonts
-imake -DBuildFonts -DUseInstalled -I%{_libdir}/X11/config
+imake -DBuildFonts -DUseInstalled -I%{xconfdir}
 %{__make} Makefiles
 cd scaled
-imake -DBuildFonts -DBuildEthiopicFonts -DBuildBethMarduthoFonts \
-       -DUseInstalled -I%{_libdir}/X11/config
+imake -DBuildFonts -DBuildEthiopicFonts -DBuildBethMarduthoFonts -DBuildSpeedoFonts \
+       -DUseInstalled -I%{xconfdir}
 %{__make} Makefiles
 cd ..
 %{__make} depend
@@ -898,12 +896,16 @@ cd xc
        UCS2ANY=`pwd`/fonts/util/ucs2any.pl \
        BDFTRUNCATE=`pwd`/fonts/util/bdftruncate.pl \
        UCSMAPPREFIX=`pwd`/fonts/util/map- \
+       BINDIR=%{_bindir} \
+       FONTDIR=%{_fontsdir} \
+       ENCODINGSDIR=%{_fontsdir}/encodings \
        DESTDIR=$RPM_BUILD_ROOT
 %{__make} -C fonts install.man \
        TOP=`pwd` \
        UCS2ANY=`pwd`/fonts/util/ucs2any.pl \
        BDFTRUNCATE=`pwd`/fonts/util/bdftruncate.pl \
        UCSMAPPREFIX=`pwd`/fonts/util/map- \
+       MANDIR=%{_mandir}/man1 \
        DESTDIR=$RPM_BUILD_ROOT
 cd ..
 
@@ -927,19 +929,13 @@ rm -f $RPM_BUILD_ROOT%{_fontsdir}/misc/fonts.alias
 mv -f $RPM_BUILD_ROOT%{_fontsdir}/cyrillic/fonts.alias{,.%{name}-KOI8-R}
 mv -f $RPM_BUILD_ROOT%{_fontsdir}/75dpi/fonts.alias{,.%{name}-75dpi-ISO8859-1}
 mv -f $RPM_BUILD_ROOT%{_fontsdir}/100dpi/fonts.alias{,.%{name}-100dpi-ISO8859-1}
-# aliases for biznet ISO8859-2 fonts
-install misc/fonts.alias $RPM_BUILD_ROOT%{_fontsdir}/misc/fonts.alias.%{name}-ISO8859-2
-grep -e 'biznet-\(chartis\|terminal\)' 75dpi/fonts.alias \
-       > $RPM_BUILD_ROOT%{_fontsdir}/75dpi/fonts.alias.%{name}-75dpi-ISO8859-2
-grep -e 'biznet-\(chartis\|terminal\)' 100dpi/fonts.alias \
-       > $RPM_BUILD_ROOT%{_fontsdir}/100dpi/fonts.alias.%{name}-100dpi-ISO8859-2
 
 # mkfontscale is not able to generate proper fonts.scale for these Type1 fonts
 tail -n +2 xc/fonts/scaled/Type1/fonts.scale | sed -e 's/\.pfa/\.pfb/' \
        > $RPM_BUILD_ROOT%{_t1fontsdir}/fonts.scale.%{name}
 rm -f $RPM_BUILD_ROOT%{_t1fontsdir}/fonts.scale
 # Fontmap for Type1 fonts (generated by type1inst)
-install %{SOURCE4} $RPM_BUILD_ROOT%{_t1fontsdir}/Fontmap.%{name}
+install %{SOURCE3} $RPM_BUILD_ROOT%{_t1fontsdir}/Fontmap.%{name}
 
 # mkfontscale doesn't support Speedo fonts
 tail -n +2 $RPM_BUILD_ROOT%{_fontsdir}/Speedo/fonts.scale \
@@ -951,9 +947,6 @@ rm -f $RPM_BUILD_ROOT%{_fontsdir}/Speedo/fonts.scale
 #      > $RPM_BUILD_ROOT%{_fontsdir}/CID/fonts.scale.XFree86-fonts
 #rm -f $RPM_BUILD_ROOT%{_fontsdir}/CID/fonts.scale
 
-install %{SOURCE5} $RPM_BUILD_ROOT%{_fontsdir}/misc
-gzip -9nf $RPM_BUILD_ROOT%{_fontsdir}/misc/vga.pcf
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -1380,7 +1373,6 @@ fontpostinst OTF
 %files ISO8859-2
 %defattr(644,root,root,755)
 %{_fontsdir}/misc/*ISO8859-2.pcf.gz
-%{_fontsdir}/misc/fonts.alias.%{name}-ISO8859-2
 
 %files ISO8859-3
 %defattr(644,root,root,755)
@@ -1466,7 +1458,6 @@ fontpostinst OTF
 %files 75dpi-ISO8859-2
 %defattr(644,root,root,755)
 %{_fontsdir}/75dpi/*ISO8859-2.pcf.gz
-%{_fontsdir}/75dpi/fonts.alias.%{name}-75dpi-ISO8859-2
 
 %files 75dpi-ISO8859-3
 %defattr(644,root,root,755)
@@ -1540,7 +1531,6 @@ fontpostinst OTF
 %files 100dpi-ISO8859-2
 %defattr(644,root,root,755)
 %{_fontsdir}/100dpi/*ISO8859-2.pcf.gz
-%{_fontsdir}/100dpi/fonts.alias.%{name}-100dpi-ISO8859-2
 
 %files 100dpi-ISO8859-3
 %defattr(644,root,root,755)