X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=XFree86-fonts.spec;h=92755fbd24f0e950eb70f8838b1047b3d046a326;hb=054207ec03e13021acf906d6b90c44ec5ce64933;hp=6ed14cdc3e35cffd6ee5ff049e170e850d236e0b;hpb=cde05ac7035579e7f7700905e81baa0e6d8797e1;p=packages%2FXFree86-fonts.git

diff --git a/XFree86-fonts.spec b/XFree86-fonts.spec
index 6ed14cd..92755fb 100644
--- a/XFree86-fonts.spec
+++ b/XFree86-fonts.spec
@@ -1,28 +1,36 @@
 Summary:	XFree86 Fonts
 Summary(pl):	Fonty dla systemu XFree86 
 Name:		XFree86-fonts
-Version:	4.0
+Version:	4.1.0
 Release:	1
-Copyright:	MIT
+License:	MIT
 Group:		X11/XFree86
+Group(de):	X11/XFree86
 Group(pl):	X11/XFree86
-Source0:	ftp://ftp.xfree86.org/pub/XFree86/4.0/source/X400src-2.tgz
-Source1:	ftp://ftp.xfree86.org/pub/XFree86/4.0/source/X400src-1.tgz
+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
 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
-Patch0:		XFree86-fonts-extras-fix.patch
-Patch1:		XFree86-fonts-ISO-8859-2.patch
-Patch2:		XFree86-ISO8859-2-pld.patch
+Source4:	%{name}.Fontmap
+Source5:	%{name}-latin2-Type1.Fontmap
+Patch0:		%{name}-extras-fix.patch
+Patch1:		%{name}-ISO8859-2.patch
+BuildRequires:	XFree86 = %{version}
 BuildRequires:	XFree86-devel = %{version}
-Requires:	type1inst
+BuildRequires:	perl
+BuildRequires:	t1utils
 Prereq:		/usr/X11R6/bin/mkfontdir
+Prereq:		textutils
+Prereq:		sed
+Obsoletes:	XFree86-latin2-fonts
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_fontdir	/usr/share/fonts
 %define		_prefix		/usr/X11R6
-%define		_mandir		/usr/X11R6/man
-%define		_appnkldir	%{_datadir}/applnk
+%define		_mandir		%{_prefix}/man
+%define		_t1fontsdir	%{_fontsdir}/Type1
+%define		_t1afmdir	%{_t1fontsdir}/afm
+%define		_t1pfmdir	%{_t1fontsdir}/pfm
 
 %description
 This package contains the basic fonts. This package is required when
@@ -32,142 +40,226 @@ you have installed X server.
 Pakiet ten zawiera podstawowe czcionki. Pakiet ten jest koniecznie
 potrzebny, je¶li masz zainstalowany jakikolwiek X serwer.
 
-%package -n XFree86-75dpi-fonts
+%package utils
+Summary:	Perl scripts for generating BDF fonts
+Summary(pl):	Skrypty perlowe do generowania fontów BDF
+Group:		X11/XFree86
+Group(de):	X11/XFree86
+Group(pl):	X11/XFree86
+
+%description utils
+Perl scripts that allow to generate from an ISO10646-1 encoded
+BDF font other BDF fonts in any possible encoding.
+
+%package 75dpi
 Summary:	X11R6 75dpi fonts - only need on server side
-Summary(de):	X11RT 76 dpi-Fonts - nur auf Serverseite erforderlich
+Summary(de):	X11RT 75 dpi-Fonts - nur auf Serverseite erforderlich
 Summary(fr):	Fontes 75 dpi X11R6 - nécessaire uniquement côté serveur
-Summary(pl):	Fonty o rozdzielczo¶ci 75dpi-niebêdne dla serwera.
+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(de):	X11/XFree86
 Group(pl):	X11/XFree86
 Prereq:		%{_bindir}/mkfontdir
+Obsoletes:	XFree86-75dpi-fonts
 
 %ifarch sparc
 Obsoletes:	X11R6.1-75dpi-fonts
 %endif
 
-%description -n XFree86-75dpi-fonts
+%description 75dpi
 The 75dpi fonts used on most Linux systems. Users with high resolution
 displays may prefer the 100dpi fonts available in a separate package.
 
-%description -l de -n XFree86-75dpi-fonts
+%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 -l fr -n XFree86-75dpi-fonts
+%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
 disponibles dans un autre paquetage.
 
-%description -l pl -n XFree86-75dpi-fonts
+%description 75dpi -l pl
 Pakiet ten zawiera czcionki rastrowe 75dpi. W wypadku wiêkszej
 rozdzielczo¶ci zalecane s± czcionki 100dpi, które s± dostêpne w
 osobnym pakiecie.
 
-%description -l tr -n XFree86-75dpi-fonts
+%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.
 
-%package -n XFree86-100dpi-fonts
+%package 100dpi
 Summary:	X11R6 100dpi fonts - only need on server side
 Summary(de):	X11R6 100dpi-Fonts - nur auf Server-Seite erforderlich
 Summary(fr):	Fontes 100ppp pour X11R6 - nécessaires seulement coté serveur.
-Summary(pl):	Fonty o rozdzielczosci 100dpi-niezbêdne dla serwera.
+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(de):	X11/XFree86
 Group(pl):	X11/XFree86
 Prereq:		%{_bindir}/mkfontdir
+Obsoletes:	XFree86-100dpi-fonts
 
 %ifarch sparc
 Obsoletes:	X11R6.1-100dpi-fonts
 %endif
 
-%description -n XFree86-100dpi-fonts
+%description 100dpi
 The 100dpi fonts used on most Linux systems. Users with high
 resolution displays may prefer the 100dpi fonts available in a
 separate package.
 
-%description -l de -n XFree86-100dpi-fonts
+%description 100dpi -l de
 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.
 
-%description -l fr -n XFree86-100dpi-fonts
+%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 -l pl -n XFree86-100dpi-fonts
+%description 100dpi -l pl
 Pakiet ten zawiera czcionki rastrowe 100dpi. Bed± one potrzebne przy
-pracy z du¿± rozdzielczo¶ci±.
+pracy w du¿ych rozdzielczo¶ciach.
 
-%description -l tr -n XFree86-100dpi-fonts
+%description 100dpi -l tr
 Yüksek çözünürlük kullanan kullanýcýlar 100dpi yazýtiplerini 75dpi
 olanlara yeðleyebilirler.
 
-%package -n XFree86-cyrillic-fonts
-Summary:	Cyrillic fonts - only need on server side
-Summary(pl):	Cyrlica
+%package KOI8-R
+Summary:	KOI8-R (cyrillic) fonts - only need on server side
+Summary(pl):	Fonty rastrowe KOI8-R (cyrylica)
 Group:		X11/XFree86
+Group(de):	X11/XFree86
 Group(pl):	X11/XFree86
 Prereq:		%{_bindir}/mkfontdir
+Obsoletes:	XFree86-cyrillic-fonts
 
-%description -n XFree86-cyrillic-fonts
-Cyrillic raster fonts.
+%description KOI8-R
+KOI8-R (cyrillic) raster fonts.
 
-%description -l pl -n XFree86-cyrillic-fonts
-Czcionki rastrowe z cyrylic±.
+%description KOI8-R -l pl
+Fonty rastrowe KOI8-R (cyrylica).
 
-%package -n XFree86-latin2-fonts
-Summary:	Latin 2 basic fonts - only need on server side
-Summary(pl):	Pliterki
+%package 100dpi-KOI8-R
+Summary:	KOI8-R 100dpi fonts - only need on server side
+Summary(pl):	Fonty rastrowe KOI8-R o rozdzielczo¶ci 100dpi
 Group:		X11/XFree86
+Group(de):	X11/XFree86
 Group(pl):	X11/XFree86
 Prereq:		%{_bindir}/mkfontdir
 
-%description -n XFree86-latin2-fonts
-Latin 2 raster fonts.
+%description 100dpi-KOI8-R
+KOI8-R raster fonts.
 
-%description -l pl -n XFree86-latin2-fonts
-Czcionki rastrowe ISO-8859-2.
+%description 100dpi-KOI8-R -l pl
+Fonty rastrowe KOI8-R o rozdzielczo¶ci 100dpi.
 
-%package -n XFree86-latin2-100dpi-fonts
-Summary:	Latin 2 100dpi fonts - only need on server side
-Summary(pl):	Pliterki
+%package 75dpi-KOI8-R
+Summary:	KOI8-R 75dpi fonts - only need on server side
+Summary(pl):	Fonty rastrowe KOI8-R o rozdzielczo¶ci 75dpi
 Group:		X11/XFree86
+Group(de):	X11/XFree86
 Group(pl):	X11/XFree86
 Prereq:		%{_bindir}/mkfontdir
 
-%description -n XFree86-latin2-100dpi-fonts
-Latin 2 raster fonts.
+%description 75dpi-KOI8-R
+KOI8-R raster fonts.
 
-%description -l pl -n XFree86-latin2-100dpi-fonts
-Czcionki rastrowe ISO-8859-2.
+%description 75dpi-KOI8-R -l pl
+Fonty rastrowe ISO-KOI8-R o rozdzielczo¶ci 75dpi.
 
-%package -n XFree86-latin2-75dpi-fonts
-Summary:	Latin 2 75dpi fonts - only need on server side
-Summary(pl):	Pliterki
+%package ISO8859-1
+Summary:	ISO-8859-1 basic fonts - only need on server side
+Summary(pl):	Podstawowe fonty rastrowe ISO-8859-1
 Group:		X11/XFree86
+Group(de):	X11/XFree86
 Group(pl):	X11/XFree86
 Prereq:		%{_bindir}/mkfontdir
 
-%description -n XFree86-latin2-75dpi-fonts
-Latin 2 raster fonts.
+%description ISO8859-1
+Basic ISO-8859-1 raster fonts.
 
-%description -l pl -n XFree86-latin2-75dpi-fonts
-Czcionki rastrowe ISO-8859-2.
+%description ISO8859-1 -l pl
+Podstawowe fonty rastrowe ISO-8859-1.
 
-%package -n XFree86-latin2-Type1-fonts
+%package 100dpi-ISO8859-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(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description 100dpi-ISO8859-1
+ISO-8859-1 raster fonts.
+
+%description 100dpi-ISO8859-1 -l pl
+Fonty rastrowe ISO-8859-1 o rozdzielczo¶ci 100dpi.
+
+%package 75dpi-ISO8859-1
+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(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description 75dpi-ISO8859-1
+ISO-8859-1 raster fonts.
+
+%description 75dpi-ISO8859-1 -l pl
+Fonty rastrowe ISO-8859-1 o rozdzielczo¶ci 75dpi.
+
+%package 100dpi-ISO8859-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(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+Obsoletes:	XFree86-ISO8859-2-100dpi-fonts
+Obsoletes:	XFree86-latin2-100dpi-fonts
+
+%description 100dpi-ISO8859-2
+ISO-8859-2 raster fonts.
+
+%description 100dpi-ISO8859-2 -l pl
+Fonty rastrowe ISO-8859-2 o rozdzielczo¶ci 100dpi.
+
+%package 75dpi-ISO8859-2
+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(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+Obsoletes:	XFree86-ISO8859-2-75dpi-fonts
+Obsoletes:	XFree86-latin2-75dpi-fonts
+
+%description 75dpi-ISO8859-2
+ISO-8859-2 raster fonts.
+
+%description 75dpi-ISO8859-2 -l pl
+Fonty rastrowe ISO-8859-2 o rozdzielczo¶ci 75dpi.
+
+%package Type1-ISO8859-2
 Summary:	Type1 (scalable) ISO8859-2 X11 system fonts
+Summary(pl):	Fonty Type 1 ISO-8859-2
 Group:		X11/Fonts
+Group(de):	X11/Fonts
 Group(pl):	X11/Fonty
-Prereq:		/usr/bin/type1inst
+Prereq:		textutils
+Prereq:		sed
 Requires:	XFree86 > 3.2 
-Requires:	type1inst >= 0.6.1
+Obsoletes:	XFree86-ISO8859-2-Type1-fonts
+Obsoletes:	XFree86-latin2-Type1-fonts
 
-%description -n XFree86-latin2-Type1-fonts
+%description Type1-ISO8859-2
 This package includes the Central European (ISO-8859-2) Type1 fonts
 for the X11 system.
 
@@ -175,49 +267,668 @@ This is the famous ulT1mo (read ultimo) collection. All fonts are
 copyrighted to their authors and declared to be freeware. Originals
 was taken from the net or CDs.
 
-%description -n XFree86-latin2-Type1-fonts -l pl
-Pakiet ten zawiera zestaw fontów Type 1 ISO-8859-2 dla X Window.
+%description Type1-ISO8859-2 -l pl
+Pakiet ten zawiera zestaw fontów Type1 ISO-8859-2 dla X Window.
 
-%prep
-%setup -q -c -b1 -b2 -a3
+%package ISO8859-3
+Summary:	ISO-8859-3 basic fonts - only need on server side
+Summary(pl):	Podstawowe fonty rastrowe ISO-8859-3
+Group:		X11/XFree86
+Group(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description ISO8859-3
+Basic ISO-8859-3 raster fonts.
+
+%description ISO8859-3 -l pl
+Podstawowe fonty rastrowe ISO-8859-3.
+
+%package 100dpi-ISO8859-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(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description 100dpi-ISO8859-3
+ISO-8859-3 raster fonts.
+
+%description 100dpi-ISO8859-3 -l pl
+Fonty rastrowe ISO-8859-3 o rozdzielczo¶ci 100dpi.
+
+%package 75dpi-ISO8859-3
+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(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description 75dpi-ISO8859-3
+ISO-8859-3 raster fonts.
+
+%description 75dpi-ISO8859-3 -l pl
+Fonty rastrowe ISO-8859-3 o rozdzielczo¶ci 75dpi.
+
+%package ISO8859-4
+Summary:	ISO-8859-4 basic fonts - only need on server side
+Summary(pl):	Podstawowe fonty rastrowe ISO-8859-4
+Group:		X11/XFree86
+Group(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description ISO8859-4
+Basic ISO-8859-4 raster fonts.
+
+%description ISO8859-4 -l pl
+Podstawowe fonty rastrowe ISO-8859-4.
+
+%package 100dpi-ISO8859-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(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description 100dpi-ISO8859-4
+ISO-8859-4 raster fonts.
+
+%description 100dpi-ISO8859-4 -l pl
+Fonty rastrowe ISO-8859-4 o rozdzielczo¶ci 100dpi.
+
+%package 75dpi-ISO8859-4
+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(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description 75dpi-ISO8859-4
+ISO-8859-4 raster fonts.
+
+%description 75dpi-ISO8859-4 -l pl
+Fonty rastrowe ISO-8859-4 o rozdzielczo¶ci 75dpi.
+
+%package ISO8859-5
+Summary:	ISO-8859-5 basic fonts - only need on server side
+Summary(pl):	Podstawowe fonty rastrowe ISO-8859-5
+Group:		X11/XFree86
+Group(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description ISO8859-5
+Basic ISO-8859-5 raster fonts.
+
+%description ISO8859-5 -l pl
+Podstawowe fonty rastrowe ISO-8859-5.
+
+%package 100dpi-ISO8859-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(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description 100dpi-ISO8859-5
+ISO-8859-5 raster fonts.
+
+%description 100dpi-ISO8859-5 -l pl
+Fonty rastrowe ISO-8859-5 o rozdzielczo¶ci 100dpi.
+
+%package 75dpi-ISO8859-5
+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(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description 75dpi-ISO8859-5
+ISO-8859-5 raster fonts.
+
+%description 75dpi-ISO8859-5 -l pl
+Fonty rastrowe ISO-8859-5 o rozdzielczo¶ci 75dpi.
+
+%package ISO8859-6
+Summary:	ISO-8859-6 basic fonts - only need on server side
+Summary(pl):	Podstawowe fonty rastrowe ISO-8859-6
+Group:		X11/XFree86
+Group(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description ISO8859-6
+Basic ISO-8859-6 raster fonts.
+
+%description ISO8859-6 -l pl
+Podstawowe fonty rastrowe ISO-8859-6.
+
+%package 100dpi-ISO8859-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(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description 100dpi-ISO8859-6
+ISO-8859-6 raster fonts.
+
+%description 100dpi-ISO8859-6 -l pl
+Fonty rastrowe ISO-8859-6 o rozdzielczo¶ci 100dpi.
+
+%package 75dpi-ISO8859-6
+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(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description 75dpi-ISO8859-6
+ISO-8859-6 raster fonts.
+
+%description 75dpi-ISO8859-6 -l pl
+Fonty rastrowe ISO-8859-6 o rozdzielczo¶ci 75dpi.
 
-rm -f misc/font*
+%package ISO8859-7
+Summary:	ISO-8859-7 basic fonts - only need on server side
+Summary(pl):	Podstawowe fonty rastrowe ISO-8859-7
+Group:		X11/XFree86
+Group(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description ISO8859-7
+Basic ISO-8859-7 raster fonts.
+
+%description ISO8859-7 -l pl
+Podstawowe fonty rastrowe ISO-8859-7.
+
+%package 100dpi-ISO8859-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(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description 100dpi-ISO8859-7
+ISO-8859-7 raster fonts.
+
+%description 100dpi-ISO8859-7 -l pl
+Fonty rastrowe ISO-8859-7 o rozdzielczo¶ci 100dpi.
+
+%package 75dpi-ISO8859-7
+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(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description 75dpi-ISO8859-7
+ISO-8859-7 raster fonts.
+
+%description 75dpi-ISO8859-7 -l pl
+Fonty rastrowe ISO-8859-7 o rozdzielczo¶ci 75dpi.
+
+%package ISO8859-8
+Summary:	ISO-8859-8 basic fonts - only need on server side
+Summary(pl):	Podstawowe fonty rastrowe ISO-8859-8
+Group:		X11/XFree86
+Group(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description ISO8859-8
+Basic ISO-8859-8 raster fonts.
+
+%description ISO8859-8 -l pl
+Podstawowe fonty rastrowe ISO-8859-8.
+
+%package 100dpi-ISO8859-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(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description 100dpi-ISO8859-8
+ISO-8859-8 raster fonts.
+
+%description 100dpi-ISO8859-8 -l pl
+Fonty rastrowe ISO-8859-8 o rozdzielczo¶ci 100dpi.
+
+%package 75dpi-ISO8859-8
+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(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description 75dpi-ISO8859-8
+ISO-8859-8 raster fonts.
+
+%description 75dpi-ISO8859-8 -l pl
+Fonty rastrowe ISO-8859-8 o rozdzielczo¶ci 75dpi.
+
+%package ISO8859-9
+Summary:	ISO-8859-9 basic fonts - only need on server side
+Summary(pl):	Podstawowe fonty rastrowe ISO-8859-9
+Group:		X11/XFree86
+Group(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description ISO8859-9
+Basic ISO-8859-9 raster fonts.
+
+%description ISO8859-9 -l pl
+Podstawowe fonty rastrowe ISO-8859-9.
+
+%package 100dpi-ISO8859-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(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description 100dpi-ISO8859-9
+ISO-8859-9 raster fonts.
+
+%description 100dpi-ISO8859-9 -l pl
+Fonty rastrowe ISO-8859-9 o rozdzielczo¶ci 100dpi.
+
+%package 75dpi-ISO8859-9
+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(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description 75dpi-ISO8859-9
+ISO-8859-9 raster fonts.
+
+%description 75dpi-ISO8859-9 -l pl
+Fonty rastrowe ISO-8859-9 o rozdzielczo¶ci 75dpi.
+
+%package ISO8859-10
+Summary:	ISO-8859-10 basic fonts - only need on server side
+Summary(pl):	Podstawowe fonty rastrowe ISO-8859-10
+Group:		X11/XFree86
+Group(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description ISO8859-10
+Basic ISO-8859-10 raster fonts.
+
+%description ISO8859-10 -l pl
+Podstawowe fonty rastrowe ISO-8859-10.
+
+%package 100dpi-ISO8859-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(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description 100dpi-ISO8859-10
+ISO-8859-10 raster fonts.
+
+%description 100dpi-ISO8859-10 -l pl
+Fonty rastrowe ISO-8859-10 o rozdzielczo¶ci 100dpi.
+
+%package 75dpi-ISO8859-10
+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(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description 75dpi-ISO8859-10
+ISO-8859-10 raster fonts.
+
+%description 75dpi-ISO8859-10 -l pl
+Fonty rastrowe ISO-8859-10 o rozdzielczo¶ci 75dpi.
+
+%package ISO8859-11
+Summary:	ISO-8859-11 basic fonts - only need on server side
+Summary(pl):	Podstawowe fonty rastrowe ISO-8859-11
+Group:		X11/XFree86
+Group(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description ISO8859-11
+Basic ISO-8859-11 raster fonts.
+
+%description ISO8859-11 -l pl
+Podstawowe fonty rastrowe ISO-8859-11.
+
+%package 100dpi-ISO8859-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(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description 100dpi-ISO8859-11
+ISO-8859-11 raster fonts.
+
+%description 100dpi-ISO8859-11 -l pl
+Fonty rastrowe ISO-8859-11 o rozdzielczo¶ci 100dpi.
+
+%package 75dpi-ISO8859-11
+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(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description 75dpi-ISO8859-11
+ISO-8859-11 raster fonts.
+
+%description 75dpi-ISO8859-11 -l pl
+Fonty rastrowe ISO-8859-11 o rozdzielczo¶ci 75dpi.
+
+%package ISO8859-12
+Summary:	ISO-8859-12 basic fonts - only need on server side
+Summary(pl):	Podstawowe fonty rastrowe ISO-8859-12
+Group:		X11/XFree86
+Group(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
 
-mv -f misc xc/fonts/bdf/latin2/
-mv -f 100dpi/{char,term,lutBS,lutRS}* xc/fonts/bdf/latin2/100dpi/
-mv -f 75dpi/{char,term,ncenR{18,24},lutBS{08,19,24},lutRS{08,19,24}}* xc/fonts/bdf/latin2/75dpi/
+%description ISO8859-12
+Basic ISO-8859-12 raster fonts.
 
-rm -rf 100dpi 75dpi misc
+%description ISO8859-12 -l pl
+Podstawowe fonty rastrowe ISO-8859-12.
 
-%patch0 -p0
+%package 100dpi-ISO8859-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(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description 100dpi-ISO8859-12
+ISO-8859-12 raster fonts.
+
+%description 100dpi-ISO8859-12 -l pl
+Fonty rastrowe ISO-8859-12 o rozdzielczo¶ci 100dpi.
+
+%package 75dpi-ISO8859-12
+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(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description 75dpi-ISO8859-12
+ISO-8859-12 raster fonts.
+
+%description 75dpi-ISO8859-12 -l pl
+Fonty rastrowe ISO-8859-12 o rozdzielczo¶ci 75dpi.
+
+%package ISO8859-13
+Summary:	ISO-8859-13 basic fonts - only need on server side
+Summary(pl):	Podstawowe fonty rastrowe ISO-8859-13
+Group:		X11/XFree86
+Group(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description ISO8859-13
+Basic ISO-8859-13 raster fonts.
+
+%description ISO8859-13 -l pl
+Podstawowe fonty rastrowe ISO-8859-13.
+
+%package 100dpi-ISO8859-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(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description 100dpi-ISO8859-13
+ISO-8859-13 raster fonts.
+
+%description 100dpi-ISO8859-13 -l pl
+Fonty rastrowe ISO-8859-13 o rozdzielczo¶ci 100dpi.
+
+%package 75dpi-ISO8859-13
+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(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description 75dpi-ISO8859-13
+ISO-8859-13 raster fonts.
+
+%description 75dpi-ISO8859-13 -l pl
+Fonty rastrowe ISO-8859-13 o rozdzielczo¶ci 75dpi.
+
+%package ISO8859-14
+Summary:	ISO-8859-14 basic fonts - only need on server side
+Summary(pl):	Podstawowe fonty rastrowe ISO-8859-14
+Group:		X11/XFree86
+Group(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description ISO8859-14
+Basic ISO-8859-14 raster fonts.
+
+%description ISO8859-14 -l pl
+Podstawowe fonty rastrowe ISO-8859-14.
+
+%package 100dpi-ISO8859-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(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description 100dpi-ISO8859-14
+ISO-8859-14 raster fonts.
+
+%description 100dpi-ISO8859-14 -l pl
+Fonty rastrowe ISO-8859-14 o rozdzielczo¶ci 100dpi.
+
+%package 75dpi-ISO8859-14
+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(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description 75dpi-ISO8859-14
+ISO-8859-14 raster fonts.
+
+%description 75dpi-ISO8859-14 -l pl
+Fonty rastrowe ISO-8859-14 o rozdzielczo¶ci 75dpi.
+
+%package ISO8859-15
+Summary:	ISO-8859-15 basic fonts - only need on server side
+Summary(pl):	Podstawowe fonty rastrowe ISO-8859-15
+Group:		X11/XFree86
+Group(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description ISO8859-15
+Basic ISO-8859-15 raster fonts.
+
+%description ISO8859-15 -l pl
+Podstawowe fonty rastrowe ISO-8859-15.
+
+%package 100dpi-ISO8859-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(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description 100dpi-ISO8859-15
+ISO-8859-15 raster fonts.
+
+%description 100dpi-ISO8859-15 -l pl
+Fonty rastrowe ISO-8859-15 o rozdzielczo¶ci 100dpi.
+
+%package 75dpi-ISO8859-15
+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(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description 75dpi-ISO8859-15
+ISO-8859-15 raster fonts.
+
+%description 75dpi-ISO8859-15 -l pl
+Fonty rastrowe ISO-8859-15 o rozdzielczo¶ci 75dpi.
+
+%package JISX0201.1976-0
+Summary:	JISX0201.1976-0 basic fonts - only need on server side
+Summary(pl):	Podstawowe fonty rastrowe JISX0201.1976-0
+Group:		X11/XFree86
+Group(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description JISX0201.1976-0
+Basic JISX0201.1976-0 raster fonts.
+
+%description JISX0201.1976-0 -l pl
+Podstawowe fonty rastrowe JISX0201.1976-0.
+
+%package 100dpi-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(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description 100dpi-JISX0201.1976-0
+JISX0201.1976-0 raster fonts.
+
+%description 100dpi-JISX0201.1976-0 -l pl
+Fonty rastrowe JISX0201.1976-0 o rozdzielczo¶ci 100dpi.
+
+%package 75dpi-JISX0201.1976-0
+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(de):	X11/XFree86
+Group(pl):	X11/XFree86
+Prereq:		%{_bindir}/mkfontdir
+
+%description 75dpi-JISX0201.1976-0
+JISX0201.1976-0 raster fonts.
+
+%description 75dpi-JISX0201.1976-0 -l pl
+Fonty rastrowe JISX0201.1976-0 o rozdzielczo¶ci 75dpi.
+
+%prep
+%setup -q -c -b1
+%setup -q -c -b1 -b2 -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/
+
+cd misc
+for i in {12x24,8x16}*.bdf ; do
+	mv $i "`echo $i | sed 's/\.bdf//'`-ISO8859-2.bdf"
+done
+cd ..
+mv -f misc/{12x24,8x16}*.bdf xc/fonts/bdf/misc/
+# TODO:
+#mv -f 100dpi/{char,term,lutBS,lutRS}* xc/fonts/bdf/100dpi/
+#mv -f 75dpi/{char,term,ncenR{18,24},lutBS{08,19,24},lutRS{08,19,24}}* xc/fonts/bdf/75dpi/
 
 %build
-make all -C ulT1mo-beta-1.0
+%{__make} all -C ulT1mo-beta-1.0
 
 cd xc/fonts
-(cd bdf/misc; cp ../../../extras/fonts/arabic24/*.bdf .)
-(cd bdf/misc; cp ../../../extras/fonts/ClearlyU/*.bdf .)
 imake -DBuildFonts -DUseInstalled -I%{_libdir}/X11/config
-make Makefiles
-make depend
-make CDEBUGFLAGS="$RPM_OPT_FLAGS"
+%{__make} Makefiles
+%{__make} depend
+cd ..
+%{__make} -C fonts TOP=`pwd` \
+	UCS2ANY=`pwd`/fonts/util/ucs2any.pl \
+	BDFTRUNCATE=`pwd`/fonts/util/bdftruncate.pl \
+	UCSMAPPREFIX=`pwd`/fonts/util/map- \
+	CDEBUGFLAGS="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-(cd xc/fonts;\
- make DESTDIR=$RPM_BUILD_ROOT install;\
- make DESTDIR=$RPM_BUILD_ROOT install.man;\
+cd xc
+%{__make} -C fonts install TOP=`pwd` \
+	UCS2ANY=`pwd`/fonts/util/ucs2any.pl \
+	BDFTRUNCATE=`pwd`/fonts/util/bdftruncate.pl \
+	UCSMAPPREFIX=`pwd`/fonts/util/map- \
+	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- \
+	DESTDIR=$RPM_BUILD_ROOT
+cd ..
+
+%{__make} -C ulT1mo-beta-1.0 install \
+	FONTDIR=$RPM_BUILD_ROOT%{_fontsdir}
+
+# separate *.afm, convert *.pfa to .pfb
+mv -f $RPM_BUILD_ROOT%{_t1fontsdir}/*.afm $RPM_BUILD_ROOT%{_t1afmdir}
+(cd $RPM_BUILD_ROOT%{_t1fontsdir}
+for f in *.pfa ; do
+	t1binary $f `basename $f .pfa`.pfb
+	rm -f $f
+done
 )
 
-make -C ulT1mo-beta-1.0 install \
-	FONTDIR=$RPM_BUILD_ROOT%{_fontdir}
+tail -n +2 ulT1mo-beta-1.0/fonts.scale.ulT1mo \
+	> $RPM_BUILD_ROOT%{_t1fontsdir}/fonts.scale.XFree86-latin2-Type1-fonts
+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-latin2-Type1-fonts
 
 # make TrueType font dir, touch default .dir and .scale files
-install	-d $RPM_BUILD_ROOT%{_fontdir}/TTF
-echo 0 > $RPM_BUILD_ROOT%{_fontdir}/TTF/fonts.dir
-echo 0 > $RPM_BUILD_ROOT%{_fontdir}/TTF/fonts.scale
+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
 
@@ -225,128 +936,298 @@ gzip -9nf RELEASE_NOTES.TXT
 rm -rf $RPM_BUILD_ROOT
 
 %post
-cd %{_fontdir}/misc
+cd %{_fontsdir}/misc
+umask 022
 %{_bindir}/mkfontdir
+cd %{_t1fontsdir}
+rm -f fonts.scale.bak Fontmap.bak
+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
+cat Fontmap.* > Fontmap
 
 %postun
-cd %{_fontdir}/misc
+cd %{_fontsdir}/misc
 umask 022
 %{_bindir}/mkfontdir
+cd %{_t1fontsdir}
+rm -f fonts.scale.bak Fontmap.bak
+cat fonts.scale.* 2>/dev/null | 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
+cat Fontmap.* > Fontmap 2>/dev/null
 
 %post -n XFree86-75dpi-fonts
-cd %{_fontdir}/75dpi
+cd %{_fontsdir}/75dpi
 umask 022
 %{_bindir}/mkfontdir
 
 %postun -n XFree86-75dpi-fonts
-cd %{_fontdir}/75dpi
+cd %{_fontsdir}/75dpi
 umask 022
 %{_bindir}/mkfontdir
 
 %post -n XFree86-100dpi-fonts
-cd %{_fontdir}/100dpi
+cd %{_fontsdir}/100dpi
+umask 022
 %{_bindir}/mkfontdir
 
 %postun -n XFree86-100dpi-fonts
-cd %{_fontdir}/100dpi
+cd %{_fontsdir}/100dpi
 umask 022
 %{_bindir}/mkfontdir
 
 %post -n XFree86-cyrillic-fonts
-cd %{_fontdir}/cyrillic
-%{_bindir}/mkfontdir
-
-%post -n XFree86-latin2-fonts
-cd %{_fontdir}/latin2/misc
+cd %{_fontsdir}/cyrillic
+umask 022
 %{_bindir}/mkfontdir
 
 %post -n XFree86-latin2-100dpi-fonts
-cd %{_fontdir}/latin2/100dpi
+cd %{_fontsdir}/latin2/100dpi
+umask 022
 %{_bindir}/mkfontdir
 
 %post -n XFree86-latin2-75dpi-fonts
-cd %{_fontdir}/latin2/75dpi
+cd %{_fontsdir}/latin2/75dpi
+umask 022
 %{_bindir}/mkfontdir
 
 %post -n XFree86-latin2-Type1-fonts
-cd %{_fontdir}/Type1
-rm -f fonts.dir fonts.scale
-/usr/bin/type1inst -nogs -nolog
-grep '^.*ISO-8859-2.pfb' %{_fontdir}/Type1/fonts.dir |\
-sed 's/\(^.*ISO-8859-2.pfb \)\(.*\)/"\2"/' |\
-sed 's/\(^".*\)\(-[a-z]*-[a-z]*"\)/\1-iso8859-2" \1\2/' |\
-grep -v ^[0-9] > %{_fontdir}/Type1/fonts.alias.tmp
-cat %{_fontdir}/Type1/fonts.alias.tmp >>\
-%{_fontdir}/Type1/fonts.alias
-sort < %{_fontdir}/Type1/fonts.alias | uniq >\
-%{_fontdir}/Type1/fonts.alias.tmp
-mv -f %{_fontdir}/Type1/fonts.alias.tmp %{_fontdir}/Type1/fonts.alias
+cd %{_t1fontsdir}
+rm -f fonts.scale.bak Fontmap.bak
+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
+cat Fontmap.* > Fontmap
+grep '^.*ISO-8859-2.pfb' %{_t1fontsdir}/fonts.dir |\
+	sed 's/\(^.*ISO-8859-2.pfb \)\(.*\)/"\2"/' |\
+	sed 's/\(^".*\)\(-[a-z]*-[a-z]*"\)/\1-iso8859-2" \1\2/' |\
+	grep -v ^[0-9] > %{_t1fontsdir}/fonts.alias.tmp
+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
 
 %postun -n XFree86-latin2-Type1-fonts
-cd %{_fontdir}/Type1
-rm -f fonts.dir fonts.scale
-/usr/bin/type1inst -nogs -nolog
-sed 's/^.*pfb -//' %{_fontdir}/Type1/fonts.dir > \
-%{_fontdir}/Type1/fonts.dir.tmp 
-grep -f %{_fontdir}/Type1/fonts.dir.tmp \
-%{_fontdir}/Type1/fonts.alias > \
-%{_fontdir}/Type1/fonts.alias.tmp
-mv -f %{_fontdir}/Type1/fonts.alias.tmp %{_fontdir}/Type1/fonts.alias
-rm -f %{_fontdir}/Type1/fonts.dir.tmp
+cd %{_t1fontsdir}
+rm -f fonts.scale.bak Fontmap.bak
+cat fonts.scale.* 2>/dev/null | 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
+cat Fontmap.* > Fontmap 2>/dev/null
+sed 's/^.*pfb -//' %{_t1fontsdir}/fonts.dir > %{_t1fontsdir}/fonts.dir.tmp 
+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
 
 %files
 %defattr(644,root,root,755)
-%dir %{_fontdir}/CID
-%dir %{_fontdir}/PEX
-%dir %{_fontdir}/Speedo
-%dir %{_fontdir}/TTF
-%dir %{_fontdir}/encodings
-%dir %{_fontdir}/local
-%dir %{_fontdir}/Type1
-%dir %{_fontdir}/misc
-%{_fontdir}/PEX/*
-%{_fontdir}/Speedo/*.spd
-%{_fontdir}/encodings/*
-%{_fontdir}/misc/*gz
-%{_fontdir}/Type1/*[a-z_].*f*
-%verify(not mtime size md5) %{_fontdir}/CID/fonts.*
-%verify(not mtime size md5) %{_fontdir}/Speedo/fonts.*
-%verify(not mtime size md5) %{_fontdir}/TTF/fonts.*
-%verify(not mtime size md5) %{_fontdir}/local/fonts.*
-%verify(not mtime size md5) %{_fontdir}/Type1/fonts.*
-%verify(not mtime size md5) %{_fontdir}/misc/fonts.*
+%doc RELEASE_NOTES.TXT.gz
+%dir %{_fontsdir}/CID
+%dir %{_fontsdir}/PEX
+%dir %{_fontsdir}/Speedo
+%dir %{_fontsdir}/TTF
+%dir %{_fontsdir}/encodings
+%dir %{_fontsdir}/local
+%dir %{_fontsdir}/misc
+%{_fontsdir}/PEX/*
+%{_fontsdir}/Speedo/*.spd
+%{_fontsdir}/encodings/*
+%{_fontsdir}/misc/*gz
+%{_t1fontsdir}/*[a-z_].pfb
+%{_t1afmdir}/*[a-z_].afm
+%{_t1fontsdir}/*.%{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}/local/fonts.*
+%verify(not mtime size md5) %{_fontsdir}/misc/fonts.*
+
+%files utils
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/*
+%{_fontsdir}/util
 
-%files -n XFree86-75dpi-fonts
+%files 75dpi
 %defattr(644,root,root,755)
-%dir %{_fontdir}/75dpi
-%{_fontdir}/75dpi/*gz
-%verify(not mtime size md5) %{_fontdir}/75dpi/fonts.*
+%dir %{_fontsdir}/75dpi
+%{_fontsdir}/75dpi/*gz
+%verify(not mtime size md5) %{_fontsdir}/75dpi/fonts.*
 
-%files -n XFree86-100dpi-fonts
+%files 100dpi
 %defattr(644,root,root,755)
-%dir %{_fontdir}/100dpi
-%{_fontdir}/100dpi/*gz
-%verify(not mtime size md5) %{_fontdir}/100dpi/fonts.*
+%dir %{_fontsdir}/100dpi
+%{_fontsdir}/100dpi/*gz
+%verify(not mtime size md5) %{_fontsdir}/100dpi/fonts.*
 
-%files -n XFree86-cyrillic-fonts
+
+%files ISO8859-1
 %defattr(644,root,root,755)
-%{_fontdir}/cyrillic
 
-%files -n XFree86-latin2-fonts
+%files 75dpi-ISO8859-1
+%defattr(644,root,root,755)
+
+%files 100dpi-ISO8859-1
+%defattr(644,root,root,755)
+
+%files ISO8859-2
+%defattr(644,root,root,755)
+
+%files 75dpi-ISO8859-2
+%defattr(644,root,root,755)
+%{_fontsdir}/latin2/75dpi
+
+%files 100dpi-ISO8859-2
+%defattr(644,root,root,755)
+%{_fontsdir}/latin2/100dpi
+
+%files Type1-ISO8859-2
+%defattr(644,root,root,755)
+%{_t1fontsdir}/*-ISO-8859-2*
+%{_t1afmdir}/*-ISO-8859-2*.afm
+%{_t1pfmdir}/*-ISO-8859-2*.pfm
+%{_t1fontsdir}/*.XFree86-latin2-Type1-fonts
+
+%files ISO8859-3
+%defattr(644,root,root,755)
+
+%files 75dpi-ISO8859-3
+%defattr(644,root,root,755)
+
+%files 100dpi-ISO8859-3
+%defattr(644,root,root,755)
+
+%files ISO8859-4
+%defattr(644,root,root,755)
+
+%files 75dpi-ISO8859-4
+%defattr(644,root,root,755)
+
+%files 100dpi-ISO8859-4
+%defattr(644,root,root,755)
+
+%files ISO8859-5
+%defattr(644,root,root,755)
+
+%files 75dpi-ISO8859-5
+%defattr(644,root,root,755)
+
+%files 100dpi-ISO8859-5
+%defattr(644,root,root,755)
+
+%files ISO8859-6
+%defattr(644,root,root,755)
+
+%files 75dpi-ISO8859-6
+%defattr(644,root,root,755)
+
+%files 100dpi-ISO8859-6
+%defattr(644,root,root,755)
+
+%files ISO8859-7
+%defattr(644,root,root,755)
+
+%files 75dpi-ISO8859-7
+%defattr(644,root,root,755)
+
+%files 100dpi-ISO8859-7
+%defattr(644,root,root,755)
+
+%files ISO8859-8
+%defattr(644,root,root,755)
+
+%files 75dpi-ISO8859-8
+%defattr(644,root,root,755)
+
+%files 100dpi-ISO8859-8
+%defattr(644,root,root,755)
+
+%files ISO8859-9
+%defattr(644,root,root,755)
+
+%files 75dpi-ISO8859-9
+%defattr(644,root,root,755)
+
+%files 100dpi-ISO8859-9
+%defattr(644,root,root,755)
+
+%files ISO8859-10
+%defattr(644,root,root,755)
+
+%files 75dpi-ISO8859-10
+%defattr(644,root,root,755)
+
+%files 100dpi-ISO8859-10
+%defattr(644,root,root,755)
+
+%files ISO8859-11
+%defattr(644,root,root,755)
+
+%files 75dpi-ISO8859-11
+%defattr(644,root,root,755)
+
+%files 100dpi-ISO8859-11
+%defattr(644,root,root,755)
+
+%files ISO8859-12
+%defattr(644,root,root,755)
+
+%files 75dpi-ISO8859-12
+%defattr(644,root,root,755)
+
+%files 100dpi-ISO8859-12
+%defattr(644,root,root,755)
+
+%files ISO8859-13
+%defattr(644,root,root,755)
+
+%files 75dpi-ISO8859-13
+%defattr(644,root,root,755)
+
+%files 100dpi-ISO8859-13
+%defattr(644,root,root,755)
+
+%files ISO8859-14
+%defattr(644,root,root,755)
+
+%files 75dpi-ISO8859-14
+%defattr(644,root,root,755)
+
+%files 100dpi-ISO8859-14
+%defattr(644,root,root,755)
+
+%files ISO8859-15
+%defattr(644,root,root,755)
+
+%files 75dpi-ISO8859-15
+%defattr(644,root,root,755)
+
+%files 100dpi-ISO8859-15
+%defattr(644,root,root,755)
+
+%files KOI8-R
+%defattr(644,root,root,755)
+%{_fontsdir}/cyrillic
+
+%files 75dpi-KOI8-R
+%defattr(644,root,root,755)
+
+%files 100dpi-KOI8-R
 %defattr(644,root,root,755)
-%doc RELEASE_NOTES.TXT.gz
-%{_fontdir}/latin2/misc
 
-%files -n XFree86-latin2-100dpi-fonts
+%files JISX0201.1976-0
 %defattr(644,root,root,755)
-%{_fontdir}/latin2/100dpi
 
-%files -n XFree86-latin2-75dpi-fonts
+%files 75dpi-JISX0201.1976-0
 %defattr(644,root,root,755)
-%{_fontdir}/latin2/75dpi
 
-%files -n XFree86-latin2-Type1-fonts
+%files 100dpi-JISX0201.1976-0
 %defattr(644,root,root,755)
-%{_fontdir}/Type1/afm/*
-%{_fontdir}/Type1/pfm/*
-%{_fontdir}/Type1/*-ISO-8859-2*