- cleanup for 4.0

- added all iso-8859-2 fonts

Changed files:
    XFree86-fonts.spec -> 1.16

diff --git a/XFree86-fonts.spec b/XFree86-fonts.spec
index f1bb1db074583d1f01637c5f6c8df8cdc61946ef..9b4be70bf2caf484760b0a0d889eeb91090c6c47 100644 (file)
--- a/XFree86-fonts.spec
+++ b/XFree86-fonts.spec
@@ -2,16 +2,21 @@ Summary:      XFree86 Fonts
 Summary(pl):   Fonty dla systemu XFree86 
 Name:          XFree86-fonts
 Version:       4.0
-Release:       0.1
+Release:       1
 Copyright:     MIT
 Group:         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
-Patch:         XFree86-fonts-extras-fix.patch
+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
 BuildRequires: XFree86-devel = %{version}
 Requires:      type1inst
 Prereq:                /usr/X11R6/bin/mkfontdir
+BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _fontdir        /usr/share/fonts
@@ -112,6 +117,19 @@ Cyrillic raster fonts.
 %description -l pl -n XFree86-cyrillic-fonts
 Czcionki rastrowe z cyrylic±.
 
+%package -n XFree86-latin2-fonts
+Summary:       Latin 2 basic fonts - only need on server side
+Summary(pl):   Pliterki
+Group:         X11/XFree86
+Group(pl):     X11/XFree86
+Prereq:                %{_bindir}/mkfontdir
+
+%description -n XFree86-latin2-fonts
+Latin 2 raster fonts.
+
+%description -l pl -n XFree86-latin2-fonts
+Czcionki rastrowe ISO-8859-2.
+
 %package -n XFree86-latin2-100dpi-fonts
 Summary:       Latin 2 100dpi fonts - only need on server side
 Summary(pl):   Pliterki
@@ -138,12 +156,43 @@ Latin 2 raster fonts.
 %description -l pl -n XFree86-latin2-75dpi-fonts
 Czcionki rastrowe ISO-8859-2.
 
+%package -n XFree86-latin2-Type1-fonts
+Summary:       Type1 (scalable) ISO8859-2 X11 system fonts
+Group:         X11/Fonts
+Group(pl):     X11/Fonty
+Prereq:                /usr/bin/type1inst
+Requires:      XFree86 > 3.2 
+Requires:      type1inst >= 0.6.1
+
+%description -n XFree86-latin2-Type1-fonts
+This package includes the Central European (ISO-8859-2) Type1 fonts for the
+X11 system.
+
+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.
+
 %prep
-%setup -q -c -b 1
+%setup -q -c -b1 -b2 -a3
+
+rm -f misc/font*
 
-%patch -p0
+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/
+
+rm -rf 100dpi 75dpi misc
+
+%patch0 -p0
+%patch1 -p1
+%patch2 -p1
 
 %build
+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 .)
@@ -152,18 +201,22 @@ make Makefiles
 make depend
 make CDEBUGFLAGS="$RPM_OPT_FLAGS"
 
-
 %install
 (cd xc/fonts;\
  make DESTDIR=$RPM_BUILD_ROOT install;\
  make DESTDIR=$RPM_BUILD_ROOT install.man;\
 )
 
+make -C ulT1mo-beta-1.0 install \
+       FONTDIR=$RPM_BUILD_ROOT%{_fontdir}
+
 # 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
 
+gzip -9nf RELEASE_NOTES.TXT
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -199,6 +252,10 @@ umask 022
 cd %{_fontdir}/cyrillic
 %{_bindir}/mkfontdir
 
+%post -n XFree86-latin2-fonts
+cd %{_fontdir}/latin2/misc
+%{_bindir}/mkfontdir
+
 %post -n XFree86-latin2-100dpi-fonts
 cd %{_fontdir}/latin2/100dpi
 %{_bindir}/mkfontdir
@@ -207,17 +264,52 @@ cd %{_fontdir}/latin2/100dpi
 cd %{_fontdir}/latin2/75dpi
 %{_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
+
+%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
+
 %files
 %defattr(644,root,root,755)
-%{_fontdir}/PEX
-%{_fontdir}/Speedo
-%{_fontdir}/Type1
-%{_fontdir}/CID
-%{_fontdir}/TTF
-%{_fontdir}/encodings
-%{_fontdir}/local
+%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.*
 
 %files -n XFree86-75dpi-fonts
@@ -236,6 +328,11 @@ cd %{_fontdir}/latin2/75dpi
 %defattr(644,root,root,755)
 %{_fontdir}/cyrillic
 
+%files -n XFree86-latin2-fonts
+%defattr(644,root,root,755)
+%doc RELEASE_NOTES.TXT.gz
+%{_fontdir}/latin2/misc
+
 %files -n XFree86-latin2-100dpi-fonts
 %defattr(644,root,root,755)
 %{_fontdir}/latin2/100dpi
@@ -243,3 +340,9 @@ cd %{_fontdir}/latin2/75dpi
 %files -n XFree86-latin2-75dpi-fonts
 %defattr(644,root,root,755)
 %{_fontdir}/latin2/75dpi
+
+%files -n XFree86-latin2-Type1-fonts
+%defattr(644,root,root,755)
+%{_fontdir}/Type1/afm/*
+%{_fontdir}/Type1/pfm/*
+%{_fontdir}/Type1/*-ISO-8859-2*