SPECS: XFree86-fonts.spec - biznet ISO8859-2 fonts moved to separa...

[qboosh]

Author: qboosh                       Date: Sun Apr  1 18:00:21 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- biznet ISO8859-2 fonts moved to separate fonts-bitmap-biznet-ISO8859-2.spec

---- Files affected:
SPECS:
   XFree86-fonts.spec (1.110 -> 1.111) 

---- Diffs:

================================================================
Index: SPECS/XFree86-fonts.spec
diff -u SPECS/XFree86-fonts.spec:1.110 SPECS/XFree86-fonts.spec:1.111
--- SPECS/XFree86-fonts.spec:1.110	Sun Apr  1 19:09:14 2007
+++ SPECS/XFree86-fonts.spec	Sun Apr  1 20:00:16 2007
@@ -14,13 +14,10 @@
 # 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
@@ -854,22 +851,14 @@
 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
@@ -927,19 +916,13 @@
 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 \
@@ -1377,7 +1360,6 @@
 %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)
@@ -1463,7 +1445,6 @@
 %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)
@@ -1537,7 +1518,6 @@
 %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)
@@ -1613,6 +1593,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.111  2007/04/01 18:00:16  qboosh
+- biznet ISO8859-2 fonts moved to separate fonts-bitmap-biznet-ISO8859-2.spec
+
 Revision 1.110  2007/04/01 17:09:14  qboosh
 - vga font moved to separate fonts-bitmap-vga.spec
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/XFree86-fonts.spec?r1=1.110&r2=1.111&f=u