- biznet ISO8859-2 fonts moved to separate fonts-bitmap-biznet-ISO8859-2.spec

Changed files:
    XFree86-fonts.spec -> 1.111

diff --git a/XFree86-fonts.spec b/XFree86-fonts.spec
index 80377b07da65e9c7a3ea6eb74d8695363f3b5a0e..4344247bfe1505da6535885b54b7c6b8629c5895 100644 (file)
--- a/XFree86-fonts.spec
+++ b/XFree86-fonts.spec
@@ -13,13 +13,10 @@ Source1:    ftp://ftp.xfree86.org/pub/XFree86/%{version}/source/XFree86-%{version}-
 # Source1-md5: 5d1792f5c154c7462c6aef39c7853b3b
 Source2:       ftp://ftp.xfree86.org/pub/XFree86/%{version}/source/XFree86-%{version}-src-5.tgz
 # Source2-md5: 5c37f028efc6d54a9c725e333f9cc8ae
-Source3:       http://www.biz.net.pl/images/ISO8859-2-bdf.tar.gz
-# Source3-md5: 5dd69ab949d833944048b10a97f7a589
-Source4:       %{name}.Fontmap
+Source3:       %{name}.Fontmap
 Patch0:                %{name}-extras-fix.patch
 Patch1:                %{name}-do_not_run_fccache.patch
-Patch2:                %{name}-ISO8859-2.patch
-Patch3:                %{name}-TTF_build.patch
+Patch2:                %{name}-TTF_build.patch
 #BuildRequires:        XFree86 >= %{version}-1
 #BuildRequires:        XFree86-devel >= %{version}-1
 BuildRequires: XFree86
@@ -853,22 +850,14 @@ Syriac OpenType fonts.
 Starosyryjskie fonty OpenType.
 
 %prep
-%setup -qc -a1 -a2 -a3
+%setup -qc -a1 -a2
 %patch0 -p0
 %patch1 -p0
 %patch2 -p1
-%patch3 -p1
 
 cp -f xc/extras/fonts/arabic24/*.bdf xc/fonts/bdf/misc
 cp -f xc/extras/fonts/ClearlyU/*.bdf xc/fonts/bdf/misc
 
-# move BIZNET ISO8859-2 fonts to main tree
-# (these fonts are still ISO8859-1 only in XFree86)
-for i in {misc/{12x24,8x16},{75,100}dpi/{char,term}}*.bdf ; do
-       j="`echo $i | sed 's/\.bdf$//'`-ISO8859-2.bdf"
-       mv -f $i xc/fonts/bdf/$j
-done
-
 %build
 cd xc/fonts
 imake -DBuildFonts -DUseInstalled -I%{_prefix}/lib/X11/config
@@ -926,19 +915,13 @@ rm -f $RPM_BUILD_ROOT%{_fontsdir}/misc/fonts.alias
 mv -f $RPM_BUILD_ROOT%{_fontsdir}/cyrillic/fonts.alias{,.%{name}-KOI8-R}
 mv -f $RPM_BUILD_ROOT%{_fontsdir}/75dpi/fonts.alias{,.%{name}-75dpi-ISO8859-1}
 mv -f $RPM_BUILD_ROOT%{_fontsdir}/100dpi/fonts.alias{,.%{name}-100dpi-ISO8859-1}
-# aliases for biznet ISO8859-2 fonts
-install misc/fonts.alias $RPM_BUILD_ROOT%{_fontsdir}/misc/fonts.alias.%{name}-ISO8859-2
-grep -e 'biznet-\(chartis\|terminal\)' 75dpi/fonts.alias \
-       > $RPM_BUILD_ROOT%{_fontsdir}/75dpi/fonts.alias.%{name}-75dpi-ISO8859-2
-grep -e 'biznet-\(chartis\|terminal\)' 100dpi/fonts.alias \
-       > $RPM_BUILD_ROOT%{_fontsdir}/100dpi/fonts.alias.%{name}-100dpi-ISO8859-2
 
 # mkfontscale is not able to generate proper fonts.scale for these Type1 fonts
 tail -n +2 xc/fonts/scaled/Type1/fonts.scale | sed -e 's/\.pfa/\.pfb/' \
        > $RPM_BUILD_ROOT%{_t1fontsdir}/fonts.scale.%{name}
 rm -f $RPM_BUILD_ROOT%{_t1fontsdir}/fonts.scale
 # Fontmap for Type1 fonts (generated by type1inst)
-install %{SOURCE4} $RPM_BUILD_ROOT%{_t1fontsdir}/Fontmap.%{name}
+install %{SOURCE3} $RPM_BUILD_ROOT%{_t1fontsdir}/Fontmap.%{name}
 
 # mkfontscale doesn't support Speedo fonts
 tail -n +2 $RPM_BUILD_ROOT%{_fontsdir}/Speedo/fonts.scale \
@@ -1376,7 +1359,6 @@ fontpostinst OTF
 %files ISO8859-2
 %defattr(644,root,root,755)
 %{_fontsdir}/misc/*ISO8859-2.pcf.gz
-%{_fontsdir}/misc/fonts.alias.%{name}-ISO8859-2
 
 %files ISO8859-3
 %defattr(644,root,root,755)
@@ -1462,7 +1444,6 @@ fontpostinst OTF
 %files 75dpi-ISO8859-2
 %defattr(644,root,root,755)
 %{_fontsdir}/75dpi/*ISO8859-2.pcf.gz
-%{_fontsdir}/75dpi/fonts.alias.%{name}-75dpi-ISO8859-2
 
 %files 75dpi-ISO8859-3
 %defattr(644,root,root,755)
@@ -1536,7 +1517,6 @@ fontpostinst OTF
 %files 100dpi-ISO8859-2
 %defattr(644,root,root,755)
 %{_fontsdir}/100dpi/*ISO8859-2.pcf.gz
-%{_fontsdir}/100dpi/fonts.alias.%{name}-100dpi-ISO8859-2
 
 %files 100dpi-ISO8859-3
 %defattr(644,root,root,755)