- merge XFree86-4_2_0 branch to HEAD.

Changed files:
    XFree86-fonts.spec -> 1.49

diff --git a/XFree86-fonts.spec b/XFree86-fonts.spec
index ca934f0ab7cd0e97f1e7bf7b13ed90d0e21db9db..e4c57f54e6d7ec8670232d14640601a73cd38ed6 100644 (file)
--- a/XFree86-fonts.spec
+++ b/XFree86-fonts.spec
@@ -1,14 +1,32 @@
+
+%define         _sver %(echo %{version} | tr -d .)
+
 Summary:       XFree86 Fonts
 Summary(pl):   Fonty dla systemu XFree86 
 Name:          XFree86-fonts
-Version:       4.1.0
-Release:       6
+Version:       4.2.0
+Release:       3
 License:       MIT
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Source0:       ftp://ftp.xfree86.org/pub/XFree86/4.0/source/X410src-2.tgz
-Source1:       ftp://ftp.xfree86.org/pub/XFree86/4.0/source/X410src-1.tgz
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+Source0:       ftp://ftp.xfree86.org/pub/XFree86/%{version}/source/X%{_sver}src-2.tgz
+Source1:       ftp://ftp.xfree86.org/pub/XFree86/%{version}/source/X%{_sver}src-1.tgz
 Source2:       http://www.biz.net.pl/images/ISO8859-2-bdf.tar.gz
 Source3:       ftp://crash.fce.vutbr.cz/pub/linux_fonts/TGZ/ulT1mo-beta-1.0.tgz
 Source4:       %{name}.Fontmap
@@ -17,16 +35,16 @@ Source6:    vga.pcf
 Patch0:                %{name}-extras-fix.patch
 Patch1:                %{name}-ISO8859-2.patch
 Patch2:                %{name}-do_not_run_xftchache.patch
-# added release because 4.1.0-1 had broken libXfont/bdftopcf
-BuildRequires: XFree86 >= %{version}
-BuildRequires: XFree86-devel >= %{version}
+BuildRequires: XFree86 >= %{version}-0.8
+BuildRequires: XFree86-devel >= %{version}-0.8
 BuildRequires: perl
 BuildRequires: t1utils
-Prereq:                /usr/X11R6/bin/mkfontdir
-Prereq:                textutils
-Prereq:                sed
+PreReq:                /usr/X11R6/bin/mkfontdir
+PreReq:                textutils
+PreReq:                sed
+Requires:      %{name}-base = %{version}
 Obsoletes:     XFree86-latin2-fonts
-# It CAN'T BE noarch because ifarch alpha for PEX fonts
+BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr/X11R6
@@ -47,13 +65,88 @@ potrzebny, je
 Summary:       Perl scripts for generating BDF fonts
 Summary(pl):   Skrypty perlowe do generowania fontów BDF
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
 
 %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
+ISO10646-1 fonty BDF z dowolnym kodowaniem.
+
+%package base
+Summary:       Base fonts (cursor and fixed)
+Summary(pl):   Podstawowe fonty (cursor i fixed)
+Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
+Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
+Group(pl):     X11/XFree86
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+
+%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.
+
+%package PEX
+Summary:       PEX fonts
+Summary(pl):   Fonty PEX
+Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
+Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
+Group(pl):     X11/XFree86
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+
+%description PEX
+PEX fonts for PEX extension (not installed by default since 4.2.0).
+
+%description PEX -l pl
+Fonty PEX do rozszerzenia PEX (nie instalowane domy¶lnie od 4.2.0).
+
 %package 75dpi
 Summary:       X11R6 75dpi fonts - only need on server side
 Summary(de):   X11RT 75 dpi-Fonts - nur auf Serverseite erforderlich
@@ -61,11 +154,25 @@ Summary(fr):       Fontes 75 dpi X11R6 - n
 Summary(pl):   Fonty o rozdzielczo¶ci 75dpi - potrzebne tylko po stronie serwera
 Summary(tr):   X11R6 75dpi yazýtipleri - yalnýzca sunucu tarafýnda gerekir
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 Obsoletes:     XFree86-75dpi-fonts
-
 %ifarch sparc
 Obsoletes:     X11R6.1-75dpi-fonts
 %endif
@@ -100,9 +207,24 @@ Summary(fr):       Fontes 100ppp pour X11R6 - n
 Summary(pl):   Fonty o rozdzielczosci 100dpi - potrzebne tylko po stronie serwera
 Summary(tr):   X11R6 100dpi yazýtipleri - yalnýzca sunucu tarafýnda gereklidir
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 Obsoletes:     XFree86-100dpi-fonts
 
 %ifarch sparc
@@ -137,9 +259,24 @@ olanlara ye
 Summary:       KOI8-R (cyrillic) fonts - only need on server side
 Summary(pl):   Fonty rastrowe KOI8-R (cyrylica)
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 Obsoletes:     XFree86-cyrillic-fonts
 
 %description KOI8-R
@@ -152,9 +289,24 @@ Fonty rastrowe KOI8-R (cyrylica).
 Summary:       KOI8-R 100dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe KOI8-R o rozdzielczo¶ci 100dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description 100dpi-KOI8-R
 KOI8-R raster fonts.
@@ -166,9 +318,24 @@ Fonty rastrowe KOI8-R o rozdzielczo
 Summary:       KOI8-R 75dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe KOI8-R o rozdzielczo¶ci 75dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description 75dpi-KOI8-R
 KOI8-R raster fonts.
@@ -180,9 +347,24 @@ Fonty rastrowe ISO-KOI8-R o rozdzielczo
 Summary:       ISO-8859-1 basic fonts - only need on server side
 Summary(pl):   Podstawowe fonty rastrowe ISO-8859-1
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description ISO8859-1
 Basic ISO-8859-1 raster fonts.
@@ -194,9 +376,24 @@ Podstawowe fonty rastrowe ISO-8859-1.
 Summary:       ISO-8859-1 100dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe ISO-8859-1 o rozdzielczo¶ci 100dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description 100dpi-ISO8859-1
 ISO-8859-1 raster fonts.
@@ -208,9 +405,24 @@ Fonty rastrowe ISO-8859-1 o rozdzielczo
 Summary:       ISO-8859-1 75dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe ISO-8859-1 o rozdzielczo¶ci 75dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description 75dpi-ISO8859-1
 ISO-8859-1 raster fonts.
@@ -222,9 +434,24 @@ Fonty rastrowe ISO-8859-1 o rozdzielczo
 Summary:       ISO-8859-2 basic fonts - only need on server side
 Summary(pl):   Podstawowe fonty rastrowe ISO-8859-2
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description ISO8859-2
 Basic ISO-8859-2 raster fonts.
@@ -236,9 +463,24 @@ Podstawowe fonty rastrowe ISO-8859-2.
 Summary:       ISO-8859-2 100dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe ISO-8859-2 o rozdzielczo¶ci 100dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 Obsoletes:     XFree86-ISO8859-2-100dpi-fonts
 Obsoletes:     XFree86-latin2-100dpi-fonts
 
@@ -252,9 +494,24 @@ Fonty rastrowe ISO-8859-2 o rozdzielczo
 Summary:       ISO-8859-2 75dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe ISO-8859-2 o rozdzielczo¶ci 75dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 Obsoletes:     XFree86-ISO8859-2-75dpi-fonts
 Obsoletes:     XFree86-latin2-75dpi-fonts
 
@@ -268,10 +525,22 @@ Fonty rastrowe ISO-8859-2 o rozdzielczo
 Summary:       Type1 (scalable) ISO8859-2 X11 system fonts
 Summary(pl):   Fonty Type 1 ISO-8859-2
 Group:         X11/Fonts
-Group(de):     X11/Fonts
+Group(cs):     X11/Fonty
+Group(da):     X11/Skrifttyper
+Group(de):     X11/Zeichensätze
+Group(es):     X11/Fuentes
+Group(fr):     X11/Polices
+Group(is):     X11/Leturgerðir
+Group(it):     X11/Font
+Group(no):     X11/Skrifttyper
 Group(pl):     X11/Fonty
-Prereq:                textutils
-Prereq:                sed
+Group(pt):     X11/Tipos de Letra
+Group(ru):     X11/ûÒÉÆÔÙ
+Group(sl):     X11/Pisave
+Group(sv):     X11/Typsnitt
+Group(uk):     X11/ûÒÉÆÔÉ
+PreReq:                textutils
+PreReq:                sed
 Requires:      XFree86 > 3.2 
 Obsoletes:     XFree86-ISO8859-2-Type1-fonts
 Obsoletes:     XFree86-latin2-Type1-fonts
@@ -291,9 +560,24 @@ Pakiet ten zawiera zestaw font
 Summary:       ISO-8859-3 basic fonts - only need on server side
 Summary(pl):   Podstawowe fonty rastrowe ISO-8859-3
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description ISO8859-3
 Basic ISO-8859-3 raster fonts.
@@ -305,9 +589,24 @@ Podstawowe fonty rastrowe ISO-8859-3.
 Summary:       ISO-8859-3 100dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe ISO-8859-3 o rozdzielczo¶ci 100dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description 100dpi-ISO8859-3
 ISO-8859-3 raster fonts.
@@ -319,9 +618,24 @@ Fonty rastrowe ISO-8859-3 o rozdzielczo
 Summary:       ISO-8859-3 75dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe ISO-8859-3 o rozdzielczo¶ci 75dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description 75dpi-ISO8859-3
 ISO-8859-3 raster fonts.
@@ -333,9 +647,24 @@ Fonty rastrowe ISO-8859-3 o rozdzielczo
 Summary:       ISO-8859-4 basic fonts - only need on server side
 Summary(pl):   Podstawowe fonty rastrowe ISO-8859-4
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description ISO8859-4
 Basic ISO-8859-4 raster fonts.
@@ -347,9 +676,24 @@ Podstawowe fonty rastrowe ISO-8859-4.
 Summary:       ISO-8859-4 100dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe ISO-8859-4 o rozdzielczo¶ci 100dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description 100dpi-ISO8859-4
 ISO-8859-4 raster fonts.
@@ -361,9 +705,24 @@ Fonty rastrowe ISO-8859-4 o rozdzielczo
 Summary:       ISO-8859-4 75dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe ISO-8859-4 o rozdzielczo¶ci 75dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description 75dpi-ISO8859-4
 ISO-8859-4 raster fonts.
@@ -375,9 +734,24 @@ Fonty rastrowe ISO-8859-4 o rozdzielczo
 Summary:       ISO-8859-5 basic fonts - only need on server side
 Summary(pl):   Podstawowe fonty rastrowe ISO-8859-5
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description ISO8859-5
 Basic ISO-8859-5 raster fonts.
@@ -389,9 +763,24 @@ Podstawowe fonty rastrowe ISO-8859-5.
 Summary:       ISO-8859-5 100dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe ISO-8859-5 o rozdzielczo¶ci 100dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description 100dpi-ISO8859-5
 ISO-8859-5 raster fonts.
@@ -403,9 +792,24 @@ Fonty rastrowe ISO-8859-5 o rozdzielczo
 Summary:       ISO-8859-5 75dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe ISO-8859-5 o rozdzielczo¶ci 75dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description 75dpi-ISO8859-5
 ISO-8859-5 raster fonts.
@@ -417,9 +821,24 @@ Fonty rastrowe ISO-8859-5 o rozdzielczo
 Summary:       ISO-8859-6 basic fonts - only need on server side
 Summary(pl):   Podstawowe fonty rastrowe ISO-8859-6
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description ISO8859-6
 Basic ISO-8859-6 raster fonts.
@@ -431,9 +850,24 @@ Podstawowe fonty rastrowe ISO-8859-6.
 Summary:       ISO-8859-6 100dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe ISO-8859-6 o rozdzielczo¶ci 100dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description 100dpi-ISO8859-6
 ISO-8859-6 raster fonts.
@@ -445,9 +879,24 @@ Fonty rastrowe ISO-8859-6 o rozdzielczo
 Summary:       ISO-8859-6 75dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe ISO-8859-6 o rozdzielczo¶ci 75dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description 75dpi-ISO8859-6
 ISO-8859-6 raster fonts.
@@ -459,9 +908,24 @@ Fonty rastrowe ISO-8859-6 o rozdzielczo
 Summary:       ISO-8859-7 basic fonts - only need on server side
 Summary(pl):   Podstawowe fonty rastrowe ISO-8859-7
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description ISO8859-7
 Basic ISO-8859-7 raster fonts.
@@ -473,9 +937,24 @@ Podstawowe fonty rastrowe ISO-8859-7.
 Summary:       ISO-8859-7 100dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe ISO-8859-7 o rozdzielczo¶ci 100dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description 100dpi-ISO8859-7
 ISO-8859-7 raster fonts.
@@ -487,9 +966,24 @@ Fonty rastrowe ISO-8859-7 o rozdzielczo
 Summary:       ISO-8859-7 75dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe ISO-8859-7 o rozdzielczo¶ci 75dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description 75dpi-ISO8859-7
 ISO-8859-7 raster fonts.
@@ -501,9 +995,24 @@ Fonty rastrowe ISO-8859-7 o rozdzielczo
 Summary:       ISO-8859-8 basic fonts - only need on server side
 Summary(pl):   Podstawowe fonty rastrowe ISO-8859-8
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description ISO8859-8
 Basic ISO-8859-8 raster fonts.
@@ -515,9 +1024,24 @@ Podstawowe fonty rastrowe ISO-8859-8.
 Summary:       ISO-8859-8 100dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe ISO-8859-8 o rozdzielczo¶ci 100dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description 100dpi-ISO8859-8
 ISO-8859-8 raster fonts.
@@ -529,9 +1053,24 @@ Fonty rastrowe ISO-8859-8 o rozdzielczo
 Summary:       ISO-8859-8 75dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe ISO-8859-8 o rozdzielczo¶ci 75dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description 75dpi-ISO8859-8
 ISO-8859-8 raster fonts.
@@ -543,9 +1082,24 @@ Fonty rastrowe ISO-8859-8 o rozdzielczo
 Summary:       ISO-8859-9 basic fonts - only need on server side
 Summary(pl):   Podstawowe fonty rastrowe ISO-8859-9
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description ISO8859-9
 Basic ISO-8859-9 raster fonts.
@@ -557,9 +1111,24 @@ Podstawowe fonty rastrowe ISO-8859-9.
 Summary:       ISO-8859-9 100dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe ISO-8859-9 o rozdzielczo¶ci 100dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description 100dpi-ISO8859-9
 ISO-8859-9 raster fonts.
@@ -571,9 +1140,24 @@ Fonty rastrowe ISO-8859-9 o rozdzielczo
 Summary:       ISO-8859-9 75dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe ISO-8859-9 o rozdzielczo¶ci 75dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description 75dpi-ISO8859-9
 ISO-8859-9 raster fonts.
@@ -585,9 +1169,24 @@ Fonty rastrowe ISO-8859-9 o rozdzielczo
 Summary:       ISO-8859-10 basic fonts - only need on server side
 Summary(pl):   Podstawowe fonty rastrowe ISO-8859-10
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description ISO8859-10
 Basic ISO-8859-10 raster fonts.
@@ -599,9 +1198,24 @@ Podstawowe fonty rastrowe ISO-8859-10.
 Summary:       ISO-8859-10 100dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe ISO-8859-10 o rozdzielczo¶ci 100dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description 100dpi-ISO8859-10
 ISO-8859-10 raster fonts.
@@ -613,9 +1227,24 @@ Fonty rastrowe ISO-8859-10 o rozdzielczo
 Summary:       ISO-8859-10 75dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe ISO-8859-10 o rozdzielczo¶ci 75dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description 75dpi-ISO8859-10
 ISO-8859-10 raster fonts.
@@ -627,9 +1256,24 @@ Fonty rastrowe ISO-8859-10 o rozdzielczo
 Summary:       ISO-8859-11 basic fonts - only need on server side
 Summary(pl):   Podstawowe fonty rastrowe ISO-8859-11
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description ISO8859-11
 Basic ISO-8859-11 raster fonts.
@@ -641,9 +1285,24 @@ Podstawowe fonty rastrowe ISO-8859-11.
 Summary:       ISO-8859-11 100dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe ISO-8859-11 o rozdzielczo¶ci 100dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description 100dpi-ISO8859-11
 ISO-8859-11 raster fonts.
@@ -655,9 +1314,24 @@ Fonty rastrowe ISO-8859-11 o rozdzielczo
 Summary:       ISO-8859-11 75dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe ISO-8859-11 o rozdzielczo¶ci 75dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description 75dpi-ISO8859-11
 ISO-8859-11 raster fonts.
@@ -669,9 +1343,24 @@ Fonty rastrowe ISO-8859-11 o rozdzielczo
 Summary:       ISO-8859-12 basic fonts - only need on server side
 Summary(pl):   Podstawowe fonty rastrowe ISO-8859-12
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description ISO8859-12
 Basic ISO-8859-12 raster fonts.
@@ -683,9 +1372,24 @@ Podstawowe fonty rastrowe ISO-8859-12.
 Summary:       ISO-8859-12 100dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe ISO-8859-12 o rozdzielczo¶ci 100dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description 100dpi-ISO8859-12
 ISO-8859-12 raster fonts.
@@ -697,9 +1401,24 @@ Fonty rastrowe ISO-8859-12 o rozdzielczo
 Summary:       ISO-8859-12 75dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe ISO-8859-12 o rozdzielczo¶ci 75dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description 75dpi-ISO8859-12
 ISO-8859-12 raster fonts.
@@ -711,9 +1430,24 @@ Fonty rastrowe ISO-8859-12 o rozdzielczo
 Summary:       ISO-8859-13 basic fonts - only need on server side
 Summary(pl):   Podstawowe fonty rastrowe ISO-8859-13
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description ISO8859-13
 Basic ISO-8859-13 raster fonts.
@@ -725,9 +1459,24 @@ Podstawowe fonty rastrowe ISO-8859-13.
 Summary:       ISO-8859-13 100dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe ISO-8859-13 o rozdzielczo¶ci 100dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description 100dpi-ISO8859-13
 ISO-8859-13 raster fonts.
@@ -739,9 +1488,24 @@ Fonty rastrowe ISO-8859-13 o rozdzielczo
 Summary:       ISO-8859-13 75dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe ISO-8859-13 o rozdzielczo¶ci 75dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description 75dpi-ISO8859-13
 ISO-8859-13 raster fonts.
@@ -753,9 +1517,24 @@ Fonty rastrowe ISO-8859-13 o rozdzielczo
 Summary:       ISO-8859-14 basic fonts - only need on server side
 Summary(pl):   Podstawowe fonty rastrowe ISO-8859-14
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description ISO8859-14
 Basic ISO-8859-14 raster fonts.
@@ -767,9 +1546,24 @@ Podstawowe fonty rastrowe ISO-8859-14.
 Summary:       ISO-8859-14 100dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe ISO-8859-14 o rozdzielczo¶ci 100dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description 100dpi-ISO8859-14
 ISO-8859-14 raster fonts.
@@ -781,9 +1575,24 @@ Fonty rastrowe ISO-8859-14 o rozdzielczo
 Summary:       ISO-8859-14 75dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe ISO-8859-14 o rozdzielczo¶ci 75dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description 75dpi-ISO8859-14
 ISO-8859-14 raster fonts.
@@ -795,9 +1604,24 @@ Fonty rastrowe ISO-8859-14 o rozdzielczo
 Summary:       ISO-8859-15 basic fonts - only need on server side
 Summary(pl):   Podstawowe fonty rastrowe ISO-8859-15
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description ISO8859-15
 Basic ISO-8859-15 raster fonts.
@@ -809,9 +1633,24 @@ Podstawowe fonty rastrowe ISO-8859-15.
 Summary:       ISO-8859-15 100dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe ISO-8859-15 o rozdzielczo¶ci 100dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description 100dpi-ISO8859-15
 ISO-8859-15 raster fonts.
@@ -823,9 +1662,24 @@ Fonty rastrowe ISO-8859-15 o rozdzielczo
 Summary:       ISO-8859-15 75dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe ISO-8859-15 o rozdzielczo¶ci 75dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description 75dpi-ISO8859-15
 ISO-8859-15 raster fonts.
@@ -837,9 +1691,24 @@ Fonty rastrowe ISO-8859-15 o rozdzielczo
 Summary:       JISX0201.1976-0 basic fonts - only need on server side
 Summary(pl):   Podstawowe fonty rastrowe JISX0201.1976-0
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description JISX0201.1976-0
 Basic JISX0201.1976-0 raster fonts.
@@ -851,9 +1720,24 @@ Podstawowe fonty rastrowe JISX0201.1976-0.
 Summary:       JISX0201.1976-0 100dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe JISX0201.1976-0 o rozdzielczo¶ci 100dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description 100dpi-JISX0201.1976-0
 JISX0201.1976-0 raster fonts.
@@ -865,9 +1749,24 @@ Fonty rastrowe JISX0201.1976-0 o rozdzielczo
 Summary:       JISX0201.1976-0 75dpi fonts - only need on server side
 Summary(pl):   Fonty rastrowe JISX0201.1976-0 o rozdzielczo¶ci 75dpi
 Group:         X11/XFree86
+Group(cs):     X11/XFree86
+Group(da):     X11/XFree86
 Group(de):     X11/XFree86
+Group(es):     X11/XFree86
+Group(fr):     X11/XFree86
+Group(id):     X11/XFree86
+Group(is):     X11/XFree86
+Group(it):     X11/XFree86
+Group(ja):     X11/XFree86
+Group(no):     X11/XFree86
 Group(pl):     X11/XFree86
-Prereq:                %{_bindir}/mkfontdir
+Group(pt_BR):  X11/XFree86
+Group(pt):     X11/XFree86
+Group(ru):     X11/XFree86
+Group(sl):     X11/XFree86
+Group(sv):     X11/XFree86
+Group(uk):     X11/XFree86
+PreReq:                %{_bindir}/mkfontdir
 
 %description 75dpi-JISX0201.1976-0
 JISX0201.1976-0 raster fonts.
@@ -876,25 +1775,18 @@ JISX0201.1976-0 raster fonts.
 Fonty rastrowe JISX0201.1976-0 o rozdzielczo¶ci 75dpi.
 
 %prep
-%setup -q -c -b1 -b2 -a3
+%setup -q -c -a1 -a2 -a3
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 
-cp xc/extras/fonts/arabic24/*.bdf xc/fonts/bdf/misc/
-cp xc/extras/fonts/ClearlyU/*.bdf xc/fonts/bdf/misc/
+cp -f xc/extras/fonts/arabic24/*.bdf xc/fonts/bdf/misc
+cp -f xc/extras/fonts/ClearlyU/*.bdf xc/fonts/bdf/misc
 
-cd misc
-for i in {12x24,8x16}*.bdf ; do
-       j="`echo $i | sed 's/\.bdf//'`-ISO8859-2.bdf"
-       mv -f $i $j
-       mv -f $j ../xc/fonts/bdf/misc/
-done
-cd ../100dpi
-for i in {char,term,lu{BIS,bB}19}*.bdf ; do
-       j="`echo $i | sed 's/\.bdf//'`-ISO8859-2.bdf"
-       mv -f $i ../xc/fonts/bdf/100dpi/$j
-       mv -f ../75dpi/$i ../xc/fonts/bdf/75dpi/$j
+# move ISO8859-2 fonts to main tree
+for i in {misc/{12x24,8x16},{75,100}dpi/{char,term,lu{BIS,bB}19}}*.bdf ; do
+       j="`echo $i | sed 's/\.bdf$//'`-ISO8859-2.bdf"
+       mv -f $i xc/fonts/bdf/$j
 done
 
 %build
@@ -938,23 +1830,22 @@ for f in *.pfa ; do
 done
 )
 
-tail -n +2 ulT1mo-beta-1.0/fonts.scale.ulT1mo \
+# make "fixed" font
+sed -e 's/^FONT -Misc.*/FONT fixed/' xc/fonts/bdf/misc/6x13-ISO8859-1.bdf | \
+       %{_bindir}/bdftopcf -t | gzip -9 > $RPM_BUILD_ROOT%{_fontsdir}/misc/fixed.pcf.gz
+
+tail -n +2 ulT1mo-beta-1.0/fonts.scale.ulT1mo | sed -e 's/\.pfb/-ISO-8859-2\.pfb/' \
        > $RPM_BUILD_ROOT%{_t1fontsdir}/fonts.scale.XFree86-fonts-Type1-ISO8859-2
 tail -n +2 xc/fonts/scaled/Type1/fonts.scale | sed -e 's/\.pfa/\.pfb/' \
        > $RPM_BUILD_ROOT%{_t1fontsdir}/fonts.scale.%{name}
 install %{SOURCE4} $RPM_BUILD_ROOT%{_t1fontsdir}/Fontmap.%{name}
 install %{SOURCE5} $RPM_BUILD_ROOT%{_t1fontsdir}/Fontmap.XFree86-fonts-Type1-ISO8859-2
-
 install %{SOURCE6} $RPM_BUILD_ROOT%{_fontsdir}/misc
+tail -n +2 $RPM_BUILD_ROOT%{_fontsdir}/TTF/fonts.scale \
+       > $RPM_BUILD_ROOT%{_fontsdir}/TTF/fonts.scale.XFree86-fonts
+rm -f $RPM_BUILD_ROOT%{_fontsdir}/TTF/fonts.scale
 gzip -9nf $RPM_BUILD_ROOT%{_fontsdir}/misc/vga.pcf
 
-# make TrueType font dir, touch default .dir and .scale files
-install        -d $RPM_BUILD_ROOT%{_fontsdir}/TTF
-echo 0 > $RPM_BUILD_ROOT%{_fontsdir}/TTF/fonts.dir
-echo 0 > $RPM_BUILD_ROOT%{_fontsdir}/TTF/fonts.scale
-
-gzip -9nf RELEASE_NOTES.TXT
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -970,6 +1861,19 @@ cat fonts.scale.tmp >> fonts.scale
 rm -f fonts.scale.tmp
 ln -sf fonts.scale fonts.dir
 cat Fontmap.* > Fontmap
+if [ -x %{_bindir}/xftcache ]; then
+       %{_bindir}/xftcache .
+fi
+cd %{_fontsdir}/TTF
+umask 022
+cat fonts.scale.* | sort -u > fonts.scale.tmp
+cat fonts.scale.tmp | wc -l | sed -e 's/ //g' > fonts.scale
+cat fonts.scale.tmp >> fonts.scale
+rm -f fonts.scale.tmp
+ln -sf fonts.scale fonts.dir
+if [ -x %{_bindir}/xftcache ]; then
+       %{_bindir}/xftcache .
+fi
 
 %postun
 cd %{_fontsdir}/misc
@@ -983,6 +1887,39 @@ cat fonts.scale.tmp >> fonts.scale
 rm -f fonts.scale.tmp
 ln -sf fonts.scale fonts.dir
 cat Fontmap.* > Fontmap 2>/dev/null
+if [ -x %{_bindir}/xftcache ]; then
+       %{_bindir}/xftcache .
+fi
+cd %{_fontsdir}/TTF
+umask 022
+cat fonts.scale.* | sort -u > fonts.scale.tmp
+cat fonts.scale.tmp | wc -l | sed -e 's/ //g' > fonts.scale
+cat fonts.scale.tmp >> fonts.scale
+rm -f fonts.scale.tmp
+ln -sf fonts.scale fonts.dir
+if [ -x %{_bindir}/xftcache ]; then
+       %{_bindir}/xftcache .
+fi
+
+%post base
+cd %{_fontsdir}/misc
+umask 022
+if [ -x %{_bindir}/mkfontdir ]; then
+       %{_bindir}/mkfontdir
+else
+       cat > fonts.dir <<EOF
+2
+cursor.pcf.gz cursor
+fixed.pcf.gz fixed
+EOF
+fi
+
+%postun base
+if [ -x %{_bindir}/mkfontdir ]; then
+       cd %{_fontsdir}/misc
+       umask 022
+       %{_bindir}/mkfontdir
+fi
 
 %post 75dpi
 cd %{_fontsdir}/75dpi
@@ -1080,6 +2017,9 @@ grep '^.*ISO-8859-2.pfb' %{_t1fontsdir}/fonts.dir |\
 cat %{_t1fontsdir}/fonts.alias.tmp >> %{_t1fontsdir}/fonts.alias
 sort -u < %{_t1fontsdir}/fonts.alias > %{_t1fontsdir}/fonts.alias.tmp
 mv -f %{_t1fontsdir}/fonts.alias.tmp %{_t1fontsdir}/fonts.alias
+if [ -x %{_bindir}/xftcache ]; then
+       %{_bindir}/xftcache .
+fi
 
 %postun Type1-ISO8859-2
 cd %{_t1fontsdir}
@@ -1095,6 +2035,9 @@ grep -f %{_t1fontsdir}/fonts.dir.tmp \
        %{_t1fontsdir}/fonts.alias > %{_t1fontsdir}/fonts.alias.tmp
 mv -f %{_t1fontsdir}/fonts.alias.tmp %{_t1fontsdir}/fonts.alias
 rm -f %{_t1fontsdir}/fonts.dir.tmp
+if [ -x %{_bindir}/xftcache ]; then
+       %{_bindir}/xftcache .
+fi
 
 %post ISO8859-3
 cd %{_fontsdir}/misc
@@ -1524,27 +2467,21 @@ umask 022
 
 %files
 %defattr(644,root,root,755)
-%doc RELEASE_NOTES.TXT.gz
 %dir %{_fontsdir}/CID
-%ifnarch alpha
-%dir %{_fontsdir}/PEX
-%endif
 %dir %{_fontsdir}/Speedo
 %dir %{_fontsdir}/TTF
 %dir %{_fontsdir}/encodings
 %dir %{_fontsdir}/local
-%dir %{_fontsdir}/misc
-%ifnarch alpha
-%{_fontsdir}/PEX/*
-%endif
 %{_fontsdir}/Speedo/*.spd
+%{_fontsdir}/TTF/*.ttf
 %{_fontsdir}/encodings/*
 %{_t1fontsdir}/*[a-z_].pfb
 %{_t1afmdir}/*[a-z_].afm
 %{_t1fontsdir}/*.%{name}
+%{_fontsdir}/TTF/fonts.scale.%{name}
 %verify(not mtime size md5) %{_fontsdir}/CID/fonts.*
 %verify(not mtime size md5) %{_fontsdir}/Speedo/fonts.*
-%verify(not mtime size md5) %{_fontsdir}/TTF/fonts.*
+%verify(not mtime size md5) %{_fontsdir}/TTF/fonts.dir
 %verify(not mtime size md5) %{_fontsdir}/local/fonts.*
 %verify(not mtime size md5) %{_fontsdir}/misc/fonts.*
 %{_fontsdir}/misc/10x20.pcf.gz
@@ -1571,13 +2508,25 @@ umask 022
 %{_fontsdir}/misc/9x18.pcf.gz
 %{_fontsdir}/misc/9x18B.pcf.gz
 %{_fontsdir}/misc/arabic*.pcf.gz
-%{_fontsdir}/misc/[c-e]*.pcf.gz
+%{_fontsdir}/misc/c[^u]*.pcf.gz
+%{_fontsdir}/misc/cu[^r]*.pcf.gz
+%{_fontsdir}/misc/[d-e]*.pcf.gz
 %{_fontsdir}/misc/[g-h]*.pcf.gz
 %{_fontsdir}/misc/k*.pcf.gz
 %{_fontsdir}/misc/[m-z]*.pcf.gz
 %{_fontsdir}/misc/*rk.pcf.gz
 %{_fontsdir}/misc/*ko.pcf.gz
 
+%files base
+%defattr(644,root,root,755)
+%dir %{_fontsdir}/misc
+%{_fontsdir}/misc/cursor.pcf.gz
+%{_fontsdir}/misc/fixed.pcf.gz
+
+%files PEX
+%defattr(644,root,root,755)
+%{_fontsdir}/PEX
+
 %files utils
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*