- fixed fonts.alias* filenames

- added lubB19-typo patch (lubB19-* fonts were not generated because of typo)
- biznet fonts and ISO8859-2 patch are back (few fonts are still not unicode)
- added more entries to do_not_run_fccache patch
- added new ISO8859-11, ISO8859-16, Ethiopic, Syriac subpackages

Changed files:
    XFree86-fonts-ISO8859-2.patch -> 1.5
    XFree86-fonts-do_not_run_fccache.patch -> 1.2
    XFree86-fonts-lubB19-typo.patch -> 1.1
    XFree86-fonts.spec -> 1.75

diff --git a/XFree86-fonts-ISO8859-2.patch b/XFree86-fonts-ISO8859-2.patch
index 98ee3b7d185b37b5b845e434a1a41e0b0b0addfe..d953ee6354d5695b692e3d87055e1d4126fd4b34 100644 (file)
--- a/XFree86-fonts-ISO8859-2.patch
+++ b/XFree86-fonts-ISO8859-2.patch
@@ -1,7 +1,6 @@
-diff -urN XFree86-fonts-4.1.0/xc/fonts/bdf/75dpi/Imakefile.inc XFree86-fonts-4.1.0.latin2/xc/fonts/bdf/75dpi/Imakefile.inc
---- XFree86-fonts-4.1.0/xc/fonts/bdf/75dpi/Imakefile.inc       Wed Apr 18 21:46:56 2001
-+++ XFree86-fonts-4.1.0.latin2/xc/fonts/bdf/75dpi/Imakefile.inc        Wed Jun 27 19:51:38 2001
-@@ -78,10 +78,18 @@
+--- XFree86-fonts-4.3.0/xc/fonts/bdf/75dpi/Imakefile.inc.orig  2003-06-03 23:47:47.000000000 +0200
++++ XFree86-fonts-4.3.0/xc/fonts/bdf/75dpi/Imakefile.inc       2003-06-03 23:57:46.000000000 +0200
+@@ -78,10 +78,17 @@
        FontObj(charBI14) FontObj(charBI18) FontObj(charBI24) \
        FontObj(charI08) FontObj(charI10) FontObj(charI12) FontObj(charI14) \
        FontObj(charI18) FontObj(charI24) \
@@ -13,7 +12,6 @@ diff -urN XFree86-fonts-4.1.0/xc/fonts/bdf/75dpi/Imakefile.inc XFree86-fonts-4.1
 +      FontObj(charR08-ISO8859-2) FontObj(charR10-ISO8859-2) \
 +      FontObj(charR12-ISO8859-2) FontObj(charR14-ISO8859-2) \
 +      FontObj(charR18-ISO8859-2) FontObj(charR24-ISO8859-2) \
-+      FontObj(luBIS19-ISO8859-2) FontObj(lubB19-ISO8859-2) \
        FontObj(tech14) FontObj(techB14) \
 -      FontObj(term14) FontObj(termB14)
 +      FontObj(term14) FontObj(termB14) \
@@ -21,7 +19,7 @@ diff -urN XFree86-fonts-4.1.0/xc/fonts/bdf/75dpi/Imakefile.inc XFree86-fonts-4.1
  
  #if BuildISO8859_1Fonts
  /*
-@@ -1312,16 +1320,32 @@
+@@ -1312,16 +1319,30 @@
  FontTarget(charI14)
  FontTarget(charI18)
  FontTarget(charI24)
@@ -43,8 +41,6 @@ diff -urN XFree86-fonts-4.1.0/xc/fonts/bdf/75dpi/Imakefile.inc XFree86-fonts-4.1
 +FontTarget(charR14-ISO8859-2)
 +FontTarget(charR18-ISO8859-2)
 +FontTarget(charR24-ISO8859-2)
-+FontTarget(luBIS19-ISO8859-2)
-+FontTarget(lubB19-ISO8859-2)
  FontTarget(tech14)
  FontTarget(techB14)
  FontTarget(term14)
@@ -54,10 +50,9 @@ diff -urN XFree86-fonts-4.1.0/xc/fonts/bdf/75dpi/Imakefile.inc XFree86-fonts-4.1
  
  #if BuildISO8859_1Fonts
  /*
-diff -urN XFree86-fonts-4.1.0/xc/fonts/bdf/misc/Imakefile XFree86-fonts-4.1.0.latin2/xc/fonts/bdf/misc/Imakefile
---- XFree86-fonts-4.1.0/xc/fonts/bdf/misc/Imakefile    Wed Jun 27 19:56:53 2001
-+++ XFree86-fonts-4.1.0.latin2/xc/fonts/bdf/misc/Imakefile     Wed Jun 27 19:54:23 2001
-@@ -276,7 +276,8 @@
+--- XFree86-fonts-4.3.0/xc/fonts/bdf/misc/Imakefile.orig       2003-06-03 23:12:12.000000000 +0200
++++ XFree86-fonts-4.3.0/xc/fonts/bdf/misc/Imakefile    2003-06-04 00:00:33.000000000 +0200
+@@ -327,7 +327,8 @@
  
  MISCOBJS = \
        $(MISC_8859_1_OBJS) $(MISC_JISX0201_OBJS) $(MISC_JA_OBJS) \
@@ -67,7 +62,7 @@ diff -urN XFree86-fonts-4.1.0/xc/fonts/bdf/misc/Imakefile XFree86-fonts-4.1.0.la
        
  OBJS = $(UCSOBJS) $(DERIVEDOBJS) $(DERIVEDOBJS2) $(PREDERIVEDOBJS) \
        $(MISCOBJS) $(ARABIC24OBJS) $(CLEARLYUOBJS)
-@@ -664,6 +665,8 @@
+@@ -787,6 +788,8 @@
  FontTarget(8x16)
  FontTarget(12x24)
  #endif
@@ -76,60 +71,3 @@ diff -urN XFree86-fonts-4.1.0/xc/fonts/bdf/misc/Imakefile XFree86-fonts-4.1.0.la
  #if BuildJISX0201Fonts
  FontTarget(8x16rk)
  FontTarget(12x24rk)
---- XFree86-fonts-4.1.0/xc/fonts/bdf/misc/fonts.alias~ Mon Jan 22 22:09:26 2001
-+++ XFree86-fonts-4.1.0/xc/fonts/bdf/misc/fonts.alias  Wed Jun 27 20:59:14 2001
-@@ -23,6 +23,29 @@
- 12x24        -sony-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-1
- nil2         -misc-nil-medium-r-normal--2-20-75-75-c-10-misc-fontspecific
- 
-+fixedlatin2    -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-2
-+variablelatin2 -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-2
-+5x7latin2      -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-2
-+5x8latin2      -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-2
-+6x9latin2      -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-2
-+6x10latin2     -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-2
-+6x12latin2     -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-2
-+6x13latin2     -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-2
-+6x13boldlatin2 -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-2
-+7x13latin2     -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-2
-+7x13boldlatin2 -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-2
-+7x14latin2     -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-2
-+7x14boldlatin2 -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-2
-+8x13latin2     -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-2
-+8x13boldlatin2 -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-2
-+8x16latin2     -sony-fixed-medium-r-normal--16-120-100-100-c-80-iso8859-2
-+9x15latin2     -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-2
-+9x15boldlatin2 -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-2
-+9x18latin2     -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-2
-+9x18boldlatin2 -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-2
-+10x20latin2    -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-2
-+12x24latin2    -sony-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-2
-+ 
- heb6x13      -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-8
- heb8x13      -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-8
- 
-@@ -75,3 +98,24 @@
- -sony-fixed-medium-r-normal--24-230-75-75-c-120-jisx0201.1976-0 -sony-fixed-medium-r-normal--24-170-100-100-c-120-jisx0201.1976-0
- -jis-fixed-medium-r-normal--16-110-100-100-c-160-jisx0208.1983-0 -jis-fixed-medium-r-normal--16-150-75-75-c-160-jisx0208.1983-0
- -jis-fixed-medium-r-normal--24-170-100-100-c-240-jisx0208.1983-0 -jis-fixed-medium-r-normal--24-230-75-75-c-240-jisx0208.1983-0
-+-misc-fixed-medium-r-normal--7-50-100-100-c-50-iso8859-2 -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-2
-+-misc-fixed-medium-r-normal--8-60-100-100-c-50-iso8859-2 -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-2
-+-misc-fixed-medium-r-normal--9-80-100-100-c-60-iso8859-2 -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-2
-+-misc-fixed-medium-r-normal--10-70-100-100-c-60-iso8859-2 -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-2
-+-misc-fixed-medium-r-semicondensed--12-90-100-100-c-60-iso8859-2 -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-2
-+-misc-fixed-medium-r-semicondensed--13-100-100-100-c-60-iso8859-2 -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-2
-+-misc-fixed-bold-r-semicondensed--13-100-100-100-c-60-iso8859-2 -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-2
-+-misc-fixed-medium-r-normal--13-100-100-100-c-70-iso8859-2 -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-2
-+-misc-fixed-bold-r-normal--13-100-100-100-c-70-iso8859-2 -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-2
-+-misc-fixed-medium-r-normal--13-100-100-100-c-80-iso8859-2 -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-2
-+-misc-fixed-bold-r-normal--13-100-100-100-c-80-iso8859-2 -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-2
-+-misc-fixed-medium-r-normal--14-110-100-100-c-70-iso8859-2 -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-2
-+-misc-fixed-medium-r-normal--15-120-100-100-c-90-iso8859-2 -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-2
-+-misc-fixed-bold-r-normal--15-120-100-100-c-90-iso8859-2 -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-2
-+-misc-fixed-medium-r-normal--20-140-100-100-c-100-iso8859-2 -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-2
-+-biznet-fixed-medium-r-normal--16-150-75-75-c-80-iso8859-2 -biznet-fixed-medium-r-normal--16-120-100-100-c-80-iso8859-2
-+-biznet-fixed-medium-r-normal--24-230-75-75-c-120-iso8859-2 -biznet-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-2
-+-sony-fixed-medium-r-normal--16-150-75-75-c-80-iso8859-2 -biznet-fixed-medium-r-normal--16-120-100-100-c-80-iso8859-2
-+-sony-fixed-medium-r-normal--16-120-100-100-c-80-iso8859-2 -biznet-fixed-medium-r-normal--16-120-100-100-c-80-iso8859-2
-+-sony-fixed-medium-r-normal--24-230-75-75-c-120-iso8859-2 -biznet-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-2
-+-sony-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-2 -biznet-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-2

diff --git a/XFree86-fonts-do_not_run_fccache.patch b/XFree86-fonts-do_not_run_fccache.patch
index 39e3923e2a40d7839ab7b1d7c9cb0768b7a5b932..ed2cc0cfb7fdbeebda6f25f6ab32481b25da93fc 100644 (file)
--- a/XFree86-fonts-do_not_run_fccache.patch
+++ b/XFree86-fonts-do_not_run_fccache.patch
@@ -33,4 +33,31 @@ diff -urN xc.orig/fonts/scaled/Type1/Imakefile xc/fonts/scaled/Type1/Imakefile
 -InstallFcCache($(FONTINSTDIR))
  #endif
  
+ #ifdef IHaveSubdirs
+--- xc/fonts/scaled/Ethiopic/Imakefile.orig    2003-02-04 03:18:19.000000000 +0100
++++ xc/fonts/scaled/Ethiopic/Imakefile 2003-06-04 00:53:08.000000000 +0200
+@@ -7,7 +7,6 @@
+ OTFINSTDIR = $(FONTDIR)/OTF
+ 
+ #if UseFreetype2
+-MakeFcCache($(TTFFONTS) $(OTFFONTS))
+ #endif
+ 
+ InstallMultipleFlags($(TTFFONTS),$(TTFINSTDIR),$(INSTDATFLAGS))
+--- xc/fonts/scaled/Meltho/Imakefile.orig      2003-06-04 01:27:53.000000000 +0200
++++ xc/fonts/scaled/Meltho/Imakefile   2003-06-04 01:28:04.000000000 +0200
+@@ -15,14 +15,12 @@
+ MakeFontsDir(fonts.scale)
+ 
+ #if UseFreetype2
+-MakeFcCache($(FONTS))
+ #endif
+ 
+ InstallFonts($(FONTINSTDIR))
+ InstallFontScale($(FONTINSTDIR))
+ InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR))
+ #if UseFreetype2
+-InstallFcCache($(FONTINSTDIR))
+ #endif
+ 
  #ifdef IHaveSubdirs

diff --git a/XFree86-fonts-lubB19-typo.patch b/XFree86-fonts-lubB19-typo.patch
new file mode 100644 (file)
index 0000000..165406d
--- /dev/null
+++ b/XFree86-fonts-lubB19-typo.patch
@@ -0,0 +1,83 @@
+--- XFree86-fonts-4.3.0/xc/fonts/bdf/75dpi/Imakefile.inc.orig  2001-07-04 18:44:29.000000000 +0200
++++ XFree86-fonts-4.3.0/xc/fonts/bdf/75dpi/Imakefile.inc       2003-06-03 23:47:47.000000000 +0200
+@@ -157,7 +157,7 @@
+       FontObj(luRS24-ISO8859-1) \
+       FontObj(lubB08-ISO8859-1) FontObj(lubB10-ISO8859-1) \
+       FontObj(lubB12-ISO8859-1) FontObj(lubB14-ISO8859-1) \
+-      FontObj(lubB18-ISO8859-1) FontObj(lubR19-ISO8859-1) \
++      FontObj(lubB18-ISO8859-1) FontObj(lubB19-ISO8859-1) \
+       FontObj(lubB24-ISO8859-1) \
+       FontObj(lubBI08-ISO8859-1) FontObj(lubBI10-ISO8859-1) \
+       FontObj(lubBI12-ISO8859-1) FontObj(lubBI14-ISO8859-1) \
+@@ -267,7 +267,7 @@
+       FontObj(luRS24-ISO8859-2) \
+       FontObj(lubB08-ISO8859-2) FontObj(lubB10-ISO8859-2) \
+       FontObj(lubB12-ISO8859-2) FontObj(lubB14-ISO8859-2) \
+-      FontObj(lubB18-ISO8859-2) FontObj(lubR19-ISO8859-2) \
++      FontObj(lubB18-ISO8859-2) FontObj(lubB19-ISO8859-2) \
+       FontObj(lubB24-ISO8859-2) \
+       FontObj(lubBI08-ISO8859-2) FontObj(lubBI10-ISO8859-2) \
+       FontObj(lubBI12-ISO8859-2) FontObj(lubBI14-ISO8859-2) \
+@@ -375,7 +375,7 @@
+       FontObj(luRS24-ISO8859-3) \
+       FontObj(lubB08-ISO8859-3) FontObj(lubB10-ISO8859-3) \
+       FontObj(lubB12-ISO8859-3) FontObj(lubB14-ISO8859-3) \
+-      FontObj(lubB18-ISO8859-3) FontObj(lubR19-ISO8859-3) \
++      FontObj(lubB18-ISO8859-3) FontObj(lubB19-ISO8859-3) \
+       FontObj(lubB24-ISO8859-3) \
+       FontObj(lubBI08-ISO8859-3) FontObj(lubBI10-ISO8859-3) \
+       FontObj(lubBI12-ISO8859-3) FontObj(lubBI14-ISO8859-3) \
+@@ -483,7 +483,7 @@
+       FontObj(luRS24-ISO8859-4) \
+       FontObj(lubB08-ISO8859-4) FontObj(lubB10-ISO8859-4) \
+       FontObj(lubB12-ISO8859-4) FontObj(lubB14-ISO8859-4) \
+-      FontObj(lubB18-ISO8859-4) FontObj(lubR19-ISO8859-4) \
++      FontObj(lubB18-ISO8859-4) FontObj(lubB19-ISO8859-4) \
+       FontObj(lubB24-ISO8859-4) \
+       FontObj(lubBI08-ISO8859-4) FontObj(lubBI10-ISO8859-4) \
+       FontObj(lubBI12-ISO8859-4) FontObj(lubBI14-ISO8859-4) \
+@@ -591,7 +591,7 @@
+       FontObj(luRS24-ISO8859-9) \
+       FontObj(lubB08-ISO8859-9) FontObj(lubB10-ISO8859-9) \
+       FontObj(lubB12-ISO8859-9) FontObj(lubB14-ISO8859-9) \
+-      FontObj(lubB18-ISO8859-9) FontObj(lubR19-ISO8859-9) \
++      FontObj(lubB18-ISO8859-9) FontObj(lubB19-ISO8859-9) \
+       FontObj(lubB24-ISO8859-9) \
+       FontObj(lubBI08-ISO8859-9) FontObj(lubBI10-ISO8859-9) \
+       FontObj(lubBI12-ISO8859-9) FontObj(lubBI14-ISO8859-9) \
+@@ -699,7 +699,7 @@
+       FontObj(luRS24-ISO8859-10) \
+       FontObj(lubB08-ISO8859-10) FontObj(lubB10-ISO8859-10) \
+       FontObj(lubB12-ISO8859-10) FontObj(lubB14-ISO8859-10) \
+-      FontObj(lubB18-ISO8859-10) FontObj(lubR19-ISO8859-10) \
++      FontObj(lubB18-ISO8859-10) FontObj(lubB19-ISO8859-10) \
+       FontObj(lubB24-ISO8859-10) \
+       FontObj(lubBI08-ISO8859-10) FontObj(lubBI10-ISO8859-10) \
+       FontObj(lubBI12-ISO8859-10) FontObj(lubBI14-ISO8859-10) \
+@@ -807,7 +807,7 @@
+       FontObj(luRS24-ISO8859-13) \
+       FontObj(lubB08-ISO8859-13) FontObj(lubB10-ISO8859-13) \
+       FontObj(lubB12-ISO8859-13) FontObj(lubB14-ISO8859-13) \
+-      FontObj(lubB18-ISO8859-13) FontObj(lubR19-ISO8859-13) \
++      FontObj(lubB18-ISO8859-13) FontObj(lubB19-ISO8859-13) \
+       FontObj(lubB24-ISO8859-13) \
+       FontObj(lubBI08-ISO8859-13) FontObj(lubBI10-ISO8859-13) \
+       FontObj(lubBI12-ISO8859-13) FontObj(lubBI14-ISO8859-13) \
+@@ -915,7 +915,7 @@
+       FontObj(luRS24-ISO8859-14) \
+       FontObj(lubB08-ISO8859-14) FontObj(lubB10-ISO8859-14) \
+       FontObj(lubB12-ISO8859-14) FontObj(lubB14-ISO8859-14) \
+-      FontObj(lubB18-ISO8859-14) FontObj(lubR19-ISO8859-14) \
++      FontObj(lubB18-ISO8859-14) FontObj(lubB19-ISO8859-14) \
+       FontObj(lubB24-ISO8859-14) \
+       FontObj(lubBI08-ISO8859-14) FontObj(lubBI10-ISO8859-14) \
+       FontObj(lubBI12-ISO8859-14) FontObj(lubBI14-ISO8859-14) \
+@@ -1023,7 +1023,7 @@
+       FontObj(luRS24-ISO8859-15) \
+       FontObj(lubB08-ISO8859-15) FontObj(lubB10-ISO8859-15) \
+       FontObj(lubB12-ISO8859-15) FontObj(lubB14-ISO8859-15) \
+-      FontObj(lubB18-ISO8859-15) FontObj(lubR19-ISO8859-15) \
++      FontObj(lubB18-ISO8859-15) FontObj(lubB19-ISO8859-15) \
+       FontObj(lubB24-ISO8859-15) \
+       FontObj(lubBI08-ISO8859-15) FontObj(lubBI10-ISO8859-15) \
+       FontObj(lubBI12-ISO8859-15) FontObj(lubBI14-ISO8859-15) \

diff --git a/XFree86-fonts.spec b/XFree86-fonts.spec
index cfb55b313ad52c38d4b058b983af7e64578be8a4..186965384f0b8e61ff8811bcf86492dfa4a7fbee 100644 (file)
--- a/XFree86-fonts.spec
+++ b/XFree86-fonts.spec
@@ -16,12 +16,13 @@ Source1:    ftp://ftp.xfree86.org/pub/XFree86/%{version}/source/X%{_sver}src-4.tgz
 # Source1-md5: 567903747018f2534965ab6cb3976b38
 Source2:       ftp://ftp.xfree86.org/pub/XFree86/%{version}/source/X%{_sver}src-5.tgz
 # Source2-md5: 4dbdbe9a85c8f7f98dd0ee015a3c7b4f
-#Source2:      http://www.biz.net.pl/images/ISO8859-2-bdf.tar.gz
-Source3:       %{name}.Fontmap
-Source4:       vga.pcf
+Source3:       http://www.biz.net.pl/images/ISO8859-2-bdf.tar.gz
+Source4:       %{name}.Fontmap
+Source5:       vga.pcf
 Patch0:                %{name}-extras-fix.patch
-#Patch1:               %{name}-ISO8859-2.patch
-Patch2:                %{name}-do_not_run_fccache.patch
+Patch1:                %{name}-do_not_run_fccache.patch
+Patch2:                %{name}-lubB19-typo.patch
+Patch3:                %{name}-ISO8859-2.patch
 BuildRequires: XFree86 >= %{version}-1
 BuildRequires: XFree86-devel >= %{version}-1
 BuildRequires: perl
@@ -266,6 +267,19 @@ ISO-8859-15 basic raster fonts.
 %description ISO8859-15 -l pl
 Podstawowe fonty rastrowe ISO-8859-15.
 
+%package ISO8859-16
+Summary:       ISO-8859-16 basic raster fonts
+Summary(pl):   Podstawowe fonty rastrowe ISO-8859-16
+Group:         X11/XFree86
+Requires(post,postun): fontpostinst
+Requires:      %{_fontsdir}/misc
+
+%description ISO8859-16
+ISO-8859-16 basic raster fonts.
+
+%description ISO8859-16 -l pl
+Podstawowe fonty rastrowe ISO-8859-16.
+
 %package JISX0201.1976-0
 Summary:       JISX0201.1976-0 basic raster fonts
 Summary(pl):   Podstawowe fonty rastrowe JISX0201.1976-0
@@ -811,6 +825,20 @@ KOI8-R 100dpi raster fonts.
 %description 100dpi-KOI8-R -l pl
 Fonty rastrowe KOI8-R o rozdzielczo¶ci 100dpi.
 
+%package Ethiopic
+Summary:       Ethiopic OpenType and TrueType fonts
+Summary(pl):   Etiopskie fonty OpenType i TrueType
+Group:         X11/XFree86
+Requires(post,postun): fontpostinst
+Requires:      %{_fontsdir}/OTF
+Requires:      %{_fontsdir}/TTF
+
+%description Ethiopic
+Ethiopic OpenType and TrueType fonts.
+
+%description Ethiopic -l pl
+Etiopskie fonty OpenType i TrueType.
+
 %package PEX
 Summary:       PEX fonts
 Summary(pl):   Fonty PEX
@@ -822,25 +850,46 @@ 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 Syriac
+Summary:       Syriac OpenType fonts
+Summary(pl):   Starosyryjskie fonty OpenType
+License:       distributable without modifications
+Group:         X11/XFree86
+Requires(post,postun): fontpostinst
+Requires:      %{_fontsdir}/OTF
+
+%description Syriac
+Syriac OpenType fonts.
+
+%description Syriac -l pl
+Starosyryjskie fonty OpenType.
+
 %prep
-%setup -q -c -a1 -a2
+%setup -q -c -a1 -a2 -a3
 %patch0 -p0
-#%patch1 -p1
-%patch2 -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 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
+# 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%{_libdir}/X11/config
 %{__make} Makefiles
+cd scaled
+imake -DBuildFonts -DBuildEthiopicFonts -DBuildBethMarduthoFonts -DUseInstalled \
+       -I%{_libdir}/X11/config
+%{__make} Makefiles
+cd ..
 %{__make} depend
 cd ..
 %{__make} -C fonts TOP=`pwd` \
@@ -882,15 +931,22 @@ grep '^fixed[ \t].*' $RPM_BUILD_ROOT%{_fontsdir}/misc/fonts.alias \
 rm -f $RPM_BUILD_ROOT%{_fontsdir}/misc/fonts.alias
 
 # support merging font aliases from other packages
-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}
+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 %{SOURCE3} $RPM_BUILD_ROOT%{_t1fontsdir}/Fontmap.%{name}
+install %{SOURCE4} $RPM_BUILD_ROOT%{_t1fontsdir}/Fontmap.%{name}
 
 # mkfontscale doesn't support Speedo fonts
 tail -n +2 $RPM_BUILD_ROOT%{_fontsdir}/Speedo/fonts.scale \
@@ -902,7 +958,7 @@ tail -n +2 $RPM_BUILD_ROOT%{_fontsdir}/CID/fonts.scale \
        > $RPM_BUILD_ROOT%{_fontsdir}/CID/fonts.scale.XFree86-fonts
 rm -f $RPM_BUILD_ROOT%{_fontsdir}/CID/fonts.scale
 
-install %{SOURCE4} $RPM_BUILD_ROOT%{_fontsdir}/misc
+install %{SOURCE5} $RPM_BUILD_ROOT%{_fontsdir}/misc
 gzip -9nf $RPM_BUILD_ROOT%{_fontsdir}/misc/vga.pcf
 
 %clean
@@ -1023,6 +1079,12 @@ fontpostinst misc
 %postun ISO8859-15
 fontpostinst misc
 
+%post ISO8859-16
+fontpostinst misc
+
+%postun ISO8859-16
+fontpostinst misc
+
 %post JISX0201.1976-0
 fontpostinst misc
 
@@ -1253,12 +1315,27 @@ fontpostinst 100dpi
 %postun 100dpi-KOI8-R
 fontpostinst 100dpi
 
+%post Ethiopic
+fontpostinst OTF
+fontpostinst TTF
+
+%postun Ethiopic
+fontpostinst OTF
+fontpostinst TTF
+
+%post Syriac
+fontpostinst OTF
+
+%postun Syriac
+fontpostinst OTF
+
 %files
 %defattr(644,root,root,755)
 %{_fontsdir}/encodings
 
 %{_fontsdir}/misc/10x20.pcf.gz
 %{_fontsdir}/misc/12x24.pcf.gz
+%{_fontsdir}/misc/4x6.pcf.gz
 %{_fontsdir}/misc/5x7.pcf.gz
 %{_fontsdir}/misc/5x8.pcf.gz
 %{_fontsdir}/misc/6x10.pcf.gz
@@ -1295,13 +1372,15 @@ fontpostinst 100dpi
 %{_fontsdir}/CID/fonts.scale.%{name}
 %ghost %{_fontsdir}/CID/fonts.dir
 
+%dir %{_fontsdir}/OTF
+
 %dir %{_fontsdir}/Speedo
 %{_fontsdir}/Speedo/*.spd
 %{_fontsdir}/Speedo/fonts.scale.%{name}
 %ghost %{_fontsdir}/Speedo/fonts.dir
 
 %dir %{_fontsdir}/TTF
-%{_fontsdir}/TTF/*.ttf
+%{_fontsdir}/TTF/luxi*.ttf
 %ghost %{_fontsdir}/TTF/fonts.dir
 
 %{_t1fontsdir}/*[a-z_].pfb
@@ -1323,16 +1402,17 @@ fontpostinst 100dpi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*
 %{_fontsdir}/util
+%{_mandir}/man1/*
 
 %files ISO8859-1
 %defattr(644,root,root,755)
-%{_fontsdir}/misc/[!6]*ISO8859-1.pcf.gz
-%{_fontsdir}/misc/6x1[!3]*ISO8859-1.pcf.gz
-%{_fontsdir}/misc/6x13[BO]-ISO8859-1.pcf.gz
+%{_fontsdir}/misc/*ISO8859-1.pcf.gz
+%exclude %{_fontsdir}/misc/6x13-ISO8859-1.pcf.gz
 
 %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)
@@ -1366,9 +1446,9 @@ fontpostinst 100dpi
 %defattr(644,root,root,755)
 %{_fontsdir}/misc/*ISO8859-10.pcf.gz
 
-#%files ISO8859-11
-#%defattr(644,root,root,755)
-#%%{_fontsdir}/misc/*ISO8859-11.pcf.gz
+%files ISO8859-11
+%defattr(644,root,root,755)
+%{_fontsdir}/misc/*ISO8859-11.pcf.gz
 
 #%files ISO8859-12
 #%defattr(644,root,root,755)
@@ -1386,6 +1466,10 @@ fontpostinst 100dpi
 %defattr(644,root,root,755)
 %{_fontsdir}/misc/*ISO8859-15.pcf.gz
 
+%files ISO8859-16
+%defattr(644,root,root,755)
+%{_fontsdir}/misc/*ISO8859-16.pcf.gz
+
 %files JISX0201.1976-0
 %defattr(644,root,root,755)
 %{_fontsdir}/misc/*JISX0201.1976-0.pcf.gz
@@ -1414,6 +1498,7 @@ fontpostinst 100dpi
 %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)
@@ -1487,6 +1572,7 @@ fontpostinst 100dpi
 %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)
@@ -1546,8 +1632,18 @@ fontpostinst 100dpi
 #%files 100dpi-KOI8-R
 #%defattr(644,root,root,755)
 
+%files Ethiopic
+%defattr(644,root,root,755)
+%{_fontsdir}/OTF/GohaTibebZemen.otf
+%{_fontsdir}/TTF/GohaTibebZemen.ttf
+
 %ifnarch alpha
 %files PEX
 %defattr(644,root,root,755)
 %{_fontsdir}/PEX
 %endif
+
+%files Syriac
+%defattr(644,root,root,755)
+%doc xc/fonts/scaled/Meltho/{README,license.txt}
+%{_fontsdir}/OTF/SyrCOM*.otf