X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=XFree86-fonts.spec;h=5e265b5c8f9337685942dfcfc66ea0d0cbdba83c;hb=1dd34759b45dc5927770ee3ef32d87887867b053;hp=8e2bea375fbfaabc679cb0aa56462b1c1dc652f6;hpb=409055253cd505db176784c3db04f4d498002240;p=packages%2FXFree86-fonts.git diff --git a/XFree86-fonts.spec b/XFree86-fonts.spec index 8e2bea3..5e265b5 100644 --- a/XFree86-fonts.spec +++ b/XFree86-fonts.spec @@ -5,37 +5,34 @@ Summary: XFree86 Fonts Summary(pl): Fonty dla systemu XFree86 Name: XFree86-fonts -Version: 4.3.99.5 +Version: 4.3.99.9 Release: 1 License: MIT -Group: X11/XFree86 -# Source0-md5: d01d01a7abd4f0764e20ef493f76a3b2 +Group: Fonts Source0: ftp://ftp.xfree86.org/pub/XFree86/develsnaps/XFree86-%{version}.tar.bz2 - +# Source0-md5: 7e8241baed829f7a23cf5e99b61cbdec # We need source0 for arabic fonts #Source0: ftp://ftp.xfree86.org/pub/XFree86/%{version}/source/X%{_sver}src-1.tgz #Source1: ftp://ftp.xfree86.org/pub/XFree86/%{version}/source/X%{_sver}src-4.tgz #Source2: ftp://ftp.xfree86.org/pub/XFree86/%{version}/source/X%{_sver}src-5.tgz -# Source3-md5: 5dd69ab949d833944048b10a97f7a589 Source3: http://www.biz.net.pl/images/ISO8859-2-bdf.tar.gz +# Source3-md5: 5dd69ab949d833944048b10a97f7a589 Source4: %{name}.Fontmap Source5: vga.pcf Patch0: %{name}-extras-fix.patch Patch1: %{name}-do_not_run_fccache.patch -Patch2: %{name}-lubB19-typo.patch -Patch3: %{name}-ISO8859-2.patch +Patch2: %{name}-ISO8859-2.patch #BuildRequires: XFree86 >= %{version}-1 #BuildRequires: XFree86-devel >= %{version}-1 BuildRequires: perl BuildRequires: t1utils -Requires(post,postun): fontpostinst Requires: %{name}-base = %{version} Requires: %{_fontsdir}/misc Requires: %{_fontsdir}/Type1 +Requires(post,postun): fontpostinst Obsoletes: XFree86-latin2-fonts BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _mandir %{_prefix}/man %define _t1fontsdir %{_fontsdir}/Type1 %define _t1afmdir %{_t1fontsdir}/afm %define _t1pfmdir %{_t1fontsdir}/pfm @@ -64,7 +61,7 @@ ISO10646-1 fonty BDF z dowolnym kodowaniem. %package base Summary: Base fonts (cursor and fixed) Summary(pl): Podstawowe fonty (cursor i fixed) -Group: X11/XFree86 +Group: Fonts Requires(post,postun): fontpostinst %description base @@ -76,9 +73,9 @@ Podstawowe fonty (cursor i fixed) niezb %package ISO8859-1 Summary: ISO-8859-1 basic raster fonts Summary(pl): Podstawowe fonty rastrowe ISO-8859-1 -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/misc +Requires(post,postun): fontpostinst %description ISO8859-1 ISO-8859-1 basic raster fonts. @@ -89,9 +86,9 @@ Podstawowe fonty rastrowe ISO-8859-1. %package ISO8859-2 Summary: ISO-8859-2 basic raster fonts Summary(pl): Podstawowe fonty rastrowe ISO-8859-2 -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/misc +Requires(post,postun): fontpostinst %description ISO8859-2 ISO-8859-2 basic raster fonts. @@ -102,9 +99,9 @@ Podstawowe fonty rastrowe ISO-8859-2. %package ISO8859-3 Summary: ISO-8859-3 basic raster fonts Summary(pl): Podstawowe fonty rastrowe ISO-8859-3 -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/misc +Requires(post,postun): fontpostinst %description ISO8859-3 ISO-8859-3 basic raster fonts. @@ -115,9 +112,9 @@ Podstawowe fonty rastrowe ISO-8859-3. %package ISO8859-4 Summary: ISO-8859-4 basic raster fonts Summary(pl): Podstawowe fonty rastrowe ISO-8859-4 -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/misc +Requires(post,postun): fontpostinst %description ISO8859-4 ISO-8859-4 basic raster fonts. @@ -128,9 +125,9 @@ Podstawowe fonty rastrowe ISO-8859-4. %package ISO8859-5 Summary: ISO-8859-5 basic raster fonts Summary(pl): Podstawowe fonty rastrowe ISO-8859-5 -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/misc +Requires(post,postun): fontpostinst %description ISO8859-5 Basic ISO-8859-5 raster fonts. @@ -141,9 +138,9 @@ Podstawowe fonty rastrowe ISO-8859-5. %package ISO8859-6 Summary: ISO-8859-6 basic raster fonts Summary(pl): Podstawowe fonty rastrowe ISO-8859-6 -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/misc +Requires(post,postun): fontpostinst %description ISO8859-6 ISO-8859-6 basic raster fonts. @@ -154,9 +151,9 @@ Podstawowe fonty rastrowe ISO-8859-6. %package ISO8859-7 Summary: ISO-8859-7 basic raster fonts Summary(pl): Podstawowe fonty rastrowe ISO-8859-7 -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/misc +Requires(post,postun): fontpostinst %description ISO8859-7 ISO-8859-7 basic raster fonts. @@ -167,9 +164,9 @@ Podstawowe fonty rastrowe ISO-8859-7. %package ISO8859-8 Summary: ISO-8859-8 basic raster fonts Summary(pl): Podstawowe fonty rastrowe ISO-8859-8 -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/misc +Requires(post,postun): fontpostinst %description ISO8859-8 ISO-8859-8 basic raster fonts. @@ -180,9 +177,9 @@ Podstawowe fonty rastrowe ISO-8859-8. %package ISO8859-9 Summary: ISO-8859-9 basic raster fonts Summary(pl): Podstawowe fonty rastrowe ISO-8859-9 -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/misc +Requires(post,postun): fontpostinst %description ISO8859-9 ISO-8859-9 basic raster fonts. @@ -193,9 +190,9 @@ Podstawowe fonty rastrowe ISO-8859-9. %package ISO8859-10 Summary: ISO-8859-10 basic raster fonts Summary(pl): Podstawowe fonty rastrowe ISO-8859-10 -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/misc +Requires(post,postun): fontpostinst %description ISO8859-10 ISO-8859-10 basic raster fonts. @@ -206,9 +203,9 @@ Podstawowe fonty rastrowe ISO-8859-10. %package ISO8859-11 Summary: ISO-8859-11 basic raster fonts Summary(pl): Podstawowe fonty rastrowe ISO-8859-11 -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/misc +Requires(post,postun): fontpostinst %description ISO8859-11 ISO-8859-11 basic raster fonts. @@ -219,9 +216,9 @@ Podstawowe fonty rastrowe ISO-8859-11. %package ISO8859-12 Summary: ISO-8859-12 basic raster fonts Summary(pl): Podstawowe fonty rastrowe ISO-8859-12 -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/misc +Requires(post,postun): fontpostinst %description ISO8859-12 ISO-8859-12 basic raster fonts. @@ -232,9 +229,9 @@ Podstawowe fonty rastrowe ISO-8859-12. %package ISO8859-13 Summary: ISO-8859-13 basic raster fonts Summary(pl): Podstawowe fonty rastrowe ISO-8859-13 -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/misc +Requires(post,postun): fontpostinst %description ISO8859-13 ISO-8859-13 basic raster fonts. @@ -245,9 +242,9 @@ Podstawowe fonty rastrowe ISO-8859-13. %package ISO8859-14 Summary: ISO-8859-14 basic raster fonts Summary(pl): Podstawowe fonty rastrowe ISO-8859-14 -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/misc +Requires(post,postun): fontpostinst %description ISO8859-14 ISO-8859-14 basic raster fonts. @@ -258,9 +255,9 @@ Podstawowe fonty rastrowe ISO-8859-14. %package ISO8859-15 Summary: ISO-8859-15 basic raster fonts Summary(pl): Podstawowe fonty rastrowe ISO-8859-15 -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/misc +Requires(post,postun): fontpostinst %description ISO8859-15 ISO-8859-15 basic raster fonts. @@ -271,9 +268,9 @@ 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 +Group: Fonts Requires: %{_fontsdir}/misc +Requires(post,postun): fontpostinst %description ISO8859-16 ISO-8859-16 basic raster fonts. @@ -284,9 +281,9 @@ 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 -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/misc +Requires(post,postun): fontpostinst %description JISX0201.1976-0 JISX0201.1976-0 basic raster fonts. @@ -297,9 +294,9 @@ Podstawowe fonty rastrowe JISX0201.1976-0. %package KOI8-R Summary: KOI8-R (cyrillic) raster fonts Summary(pl): Fonty rastrowe KOI8-R (cyrylica) -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/misc +Requires(post,postun): fontpostinst Obsoletes: XFree86-cyrillic-fonts %description KOI8-R @@ -314,7 +311,7 @@ Summary(de): X11R6 75 dpi-Fonts Summary(fr): Fontes 75 dpi X11R6 Summary(pl): Fonty rastrowe o rozdzielczo¶ci 75dpi Summary(tr): X11R6 75dpi yazýtipleri -Group: X11/XFree86 +Group: Fonts Requires(post,postun): fontpostinst Obsoletes: XFree86-75dpi-fonts %ifarch sparc @@ -347,9 +344,9 @@ kullanan kullan %package 75dpi-ISO8859-1 Summary: ISO-8859-1 75dpi raster fonts Summary(pl): Fonty rastrowe ISO-8859-1 o rozdzielczo¶ci 75dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/75dpi +Requires(post,postun): fontpostinst %description 75dpi-ISO8859-1 ISO-8859-1 75dpi raster fonts. @@ -360,9 +357,9 @@ Fonty rastrowe ISO-8859-1 o rozdzielczo %package 75dpi-ISO8859-2 Summary: ISO-8859-2 75dpi raster fonts Summary(pl): Fonty rastrowe ISO-8859-2 o rozdzielczo¶ci 75dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/75dpi +Requires(post,postun): fontpostinst Obsoletes: XFree86-ISO8859-2-75dpi-fonts Obsoletes: XFree86-latin2-75dpi-fonts @@ -375,9 +372,9 @@ Fonty rastrowe ISO-8859-2 o rozdzielczo %package 75dpi-ISO8859-3 Summary: ISO-8859-3 75dpi raster fonts Summary(pl): Fonty rastrowe ISO-8859-3 o rozdzielczo¶ci 75dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/75dpi +Requires(post,postun): fontpostinst %description 75dpi-ISO8859-3 ISO-8859-3 75dpi raster fonts. @@ -388,9 +385,9 @@ Fonty rastrowe ISO-8859-3 o rozdzielczo %package 75dpi-ISO8859-4 Summary: ISO-8859-4 75dpi raster fonts Summary(pl): Fonty rastrowe ISO-8859-4 o rozdzielczo¶ci 75dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/75dpi +Requires(post,postun): fontpostinst %description 75dpi-ISO8859-4 ISO-8859-4 75dpi raster fonts. @@ -401,9 +398,9 @@ Fonty rastrowe ISO-8859-4 o rozdzielczo %package 75dpi-ISO8859-5 Summary: ISO-8859-5 75dpi raster fonts Summary(pl): Fonty rastrowe ISO-8859-5 o rozdzielczo¶ci 75dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/75dpi +Requires(post,postun): fontpostinst %description 75dpi-ISO8859-5 ISO-8859-5 75dpi raster fonts. @@ -414,9 +411,9 @@ Fonty rastrowe ISO-8859-5 o rozdzielczo %package 75dpi-ISO8859-6 Summary: ISO-8859-6 75dpi raster fonts Summary(pl): Fonty rastrowe ISO-8859-6 o rozdzielczo¶ci 75dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/75dpi +Requires(post,postun): fontpostinst %description 75dpi-ISO8859-6 ISO-8859-6 75dpi raster fonts. @@ -427,9 +424,9 @@ Fonty rastrowe ISO-8859-6 o rozdzielczo %package 75dpi-ISO8859-7 Summary: ISO-8859-7 75dpi raster fonts Summary(pl): Fonty rastrowe ISO-8859-7 o rozdzielczo¶ci 75dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/75dpi +Requires(post,postun): fontpostinst %description 75dpi-ISO8859-7 ISO-8859-7 75dpi raster fonts. @@ -440,9 +437,9 @@ Fonty rastrowe ISO-8859-7 o rozdzielczo %package 75dpi-ISO8859-8 Summary: ISO-8859-8 75dpi raster fonts Summary(pl): Fonty rastrowe ISO-8859-8 o rozdzielczo¶ci 75dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/75dpi +Requires(post,postun): fontpostinst %description 75dpi-ISO8859-8 ISO-8859-8 75dpi raster fonts. @@ -453,9 +450,9 @@ Fonty rastrowe ISO-8859-8 o rozdzielczo %package 75dpi-ISO8859-9 Summary: ISO-8859-9 75dpi raster fonts Summary(pl): Fonty rastrowe ISO-8859-9 o rozdzielczo¶ci 75dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/75dpi +Requires(post,postun): fontpostinst %description 75dpi-ISO8859-9 ISO-8859-9 75dpi raster fonts. @@ -466,9 +463,9 @@ Fonty rastrowe ISO-8859-9 o rozdzielczo %package 75dpi-ISO8859-10 Summary: ISO-8859-10 75dpi raster fonts Summary(pl): Fonty rastrowe ISO-8859-10 o rozdzielczo¶ci 75dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/75dpi +Requires(post,postun): fontpostinst %description 75dpi-ISO8859-10 ISO-8859-10 75dpi raster fonts. @@ -479,9 +476,9 @@ Fonty rastrowe ISO-8859-10 o rozdzielczo %package 75dpi-ISO8859-11 Summary: ISO-8859-11 75dpi raster fonts Summary(pl): Fonty rastrowe ISO-8859-11 o rozdzielczo¶ci 75dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/75dpi +Requires(post,postun): fontpostinst %description 75dpi-ISO8859-11 ISO-8859-11 75dpi raster fonts. @@ -492,9 +489,9 @@ Fonty rastrowe ISO-8859-11 o rozdzielczo %package 75dpi-ISO8859-12 Summary: ISO-8859-12 75dpi raster fonts Summary(pl): Fonty rastrowe ISO-8859-12 o rozdzielczo¶ci 75dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/75dpi +Requires(post,postun): fontpostinst %description 75dpi-ISO8859-12 ISO-8859-12 75dpi raster fonts. @@ -505,9 +502,9 @@ Fonty rastrowe ISO-8859-12 o rozdzielczo %package 75dpi-ISO8859-13 Summary: ISO-8859-13 75dpi raster fonts Summary(pl): Fonty rastrowe ISO-8859-13 o rozdzielczo¶ci 75dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/75dpi +Requires(post,postun): fontpostinst %description 75dpi-ISO8859-13 ISO-8859-13 75dpi raster fonts. @@ -518,9 +515,9 @@ Fonty rastrowe ISO-8859-13 o rozdzielczo %package 75dpi-ISO8859-14 Summary: ISO-8859-14 75dpi raster fonts Summary(pl): Fonty rastrowe ISO-8859-14 o rozdzielczo¶ci 75dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/75dpi +Requires(post,postun): fontpostinst %description 75dpi-ISO8859-14 ISO-8859-14 75dpi raster fonts. @@ -531,9 +528,9 @@ Fonty rastrowe ISO-8859-14 o rozdzielczo %package 75dpi-ISO8859-15 Summary: ISO-8859-15 75dpi raster fonts Summary(pl): Fonty rastrowe ISO-8859-15 o rozdzielczo¶ci 75dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/75dpi +Requires(post,postun): fontpostinst %description 75dpi-ISO8859-15 ISO-8859-15 75dpi raster fonts. @@ -544,9 +541,9 @@ Fonty rastrowe ISO-8859-15 o rozdzielczo %package 75dpi-JISX0201.1976-0 Summary: JISX0201.1976-0 75dpi raster fonts Summary(pl): Fonty rastrowe JISX0201.1976-0 o rozdzielczo¶ci 75dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/75dpi +Requires(post,postun): fontpostinst %description 75dpi-JISX0201.1976-0 JISX0201.1976-0 75dpi raster fonts. @@ -557,9 +554,9 @@ Fonty rastrowe JISX0201.1976-0 o rozdzielczo %package 75dpi-KOI8-R Summary: KOI8-R 75dpi raster fonts Summary(pl): Fonty rastrowe KOI8-R o rozdzielczo¶ci 75dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/75dpi +Requires(post,postun): fontpostinst %description 75dpi-KOI8-R KOI8-R 75dpi raster fonts. @@ -573,7 +570,7 @@ Summary(de): X11R6 100dpi-Fonts Summary(fr): Fontes 100ppp pour X11R6 Summary(pl): Fonty rastrowe o rozdzielczo¶ci 100dpi Summary(tr): X11R6 100dpi yazýtipleri -Group: X11/XFree86 +Group: Fonts Requires(post,postun): fontpostinst Obsoletes: XFree86-100dpi-fonts %ifarch sparc @@ -606,9 +603,9 @@ olanlara ye %package 100dpi-ISO8859-1 Summary: ISO-8859-1 100dpi raster fonts Summary(pl): Fonty rastrowe ISO-8859-1 o rozdzielczo¶ci 100dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/100dpi +Requires(post,postun): fontpostinst %description 100dpi-ISO8859-1 ISO-8859-1 100dpi raster fonts. @@ -619,9 +616,9 @@ Fonty rastrowe ISO-8859-1 o rozdzielczo %package 100dpi-ISO8859-2 Summary: ISO-8859-2 100dpi raster fonts Summary(pl): Fonty rastrowe ISO-8859-2 o rozdzielczo¶ci 100dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/100dpi +Requires(post,postun): fontpostinst Obsoletes: XFree86-ISO8859-2-100dpi-fonts Obsoletes: XFree86-latin2-100dpi-fonts @@ -634,9 +631,9 @@ Fonty rastrowe ISO-8859-2 o rozdzielczo %package 100dpi-ISO8859-3 Summary: ISO-8859-3 100dpi raster fonts Summary(pl): Fonty rastrowe ISO-8859-3 o rozdzielczo¶ci 100dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/100dpi +Requires(post,postun): fontpostinst %description 100dpi-ISO8859-3 ISO-8859-3 100dpi raster fonts. @@ -647,9 +644,9 @@ Fonty rastrowe ISO-8859-3 o rozdzielczo %package 100dpi-ISO8859-4 Summary: ISO-8859-4 100dpi raster fonts Summary(pl): Fonty rastrowe ISO-8859-4 o rozdzielczo¶ci 100dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/100dpi +Requires(post,postun): fontpostinst %description 100dpi-ISO8859-4 ISO-8859-4 100dpi raster fonts. @@ -660,9 +657,9 @@ Fonty rastrowe ISO-8859-4 o rozdzielczo %package 100dpi-ISO8859-5 Summary: ISO-8859-5 100dpi raster fonts Summary(pl): Fonty rastrowe ISO-8859-5 o rozdzielczo¶ci 100dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/100dpi +Requires(post,postun): fontpostinst %description 100dpi-ISO8859-5 ISO-8859-5 100dpi raster fonts. @@ -673,9 +670,9 @@ Fonty rastrowe ISO-8859-5 o rozdzielczo %package 100dpi-ISO8859-6 Summary: ISO-8859-6 100dpi raster fonts Summary(pl): Fonty rastrowe ISO-8859-6 o rozdzielczo¶ci 100dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/100dpi +Requires(post,postun): fontpostinst %description 100dpi-ISO8859-6 ISO-8859-6 100dpi raster fonts. @@ -686,9 +683,9 @@ Fonty rastrowe ISO-8859-6 o rozdzielczo %package 100dpi-ISO8859-7 Summary: ISO-8859-7 100dpi raster fonts Summary(pl): Fonty rastrowe ISO-8859-7 o rozdzielczo¶ci 100dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/100dpi +Requires(post,postun): fontpostinst %description 100dpi-ISO8859-7 ISO-8859-7 100dpi raster fonts. @@ -699,9 +696,9 @@ Fonty rastrowe ISO-8859-7 o rozdzielczo %package 100dpi-ISO8859-8 Summary: ISO-8859-8 100dpi raster fonts Summary(pl): Fonty rastrowe ISO-8859-8 o rozdzielczo¶ci 100dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/100dpi +Requires(post,postun): fontpostinst %description 100dpi-ISO8859-8 ISO-8859-8 100dpi raster fonts. @@ -712,9 +709,9 @@ Fonty rastrowe ISO-8859-8 o rozdzielczo %package 100dpi-ISO8859-9 Summary: ISO-8859-9 100dpi raster fonts Summary(pl): Fonty rastrowe ISO-8859-9 o rozdzielczo¶ci 100dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/100dpi +Requires(post,postun): fontpostinst %description 100dpi-ISO8859-9 ISO-8859-9 100dpi raster fonts. @@ -725,9 +722,9 @@ Fonty rastrowe ISO-8859-9 o rozdzielczo %package 100dpi-ISO8859-10 Summary: ISO-8859-10 100dpi raster fonts Summary(pl): Fonty rastrowe ISO-8859-10 o rozdzielczo¶ci 100dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/100dpi +Requires(post,postun): fontpostinst %description 100dpi-ISO8859-10 ISO-8859-10 100dpi raster fonts. @@ -738,9 +735,9 @@ Fonty rastrowe ISO-8859-10 o rozdzielczo %package 100dpi-ISO8859-11 Summary: ISO-8859-11 100dpi raster fonts Summary(pl): Fonty rastrowe ISO-8859-11 o rozdzielczo¶ci 100dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/100dpi +Requires(post,postun): fontpostinst %description 100dpi-ISO8859-11 ISO-8859-11 100dpi raster fonts. @@ -751,9 +748,9 @@ Fonty rastrowe ISO-8859-11 o rozdzielczo %package 100dpi-ISO8859-12 Summary: ISO-8859-12 100dpi raster fonts Summary(pl): Fonty rastrowe ISO-8859-12 o rozdzielczo¶ci 100dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/100dpi +Requires(post,postun): fontpostinst %description 100dpi-ISO8859-12 ISO-8859-12 100dpi raster fonts. @@ -764,9 +761,9 @@ Fonty rastrowe ISO-8859-12 o rozdzielczo %package 100dpi-ISO8859-13 Summary: ISO-8859-13 100dpi raster fonts Summary(pl): Fonty rastrowe ISO-8859-13 o rozdzielczo¶ci 100dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/100dpi +Requires(post,postun): fontpostinst %description 100dpi-ISO8859-13 ISO-8859-13 100dpi raster fonts. @@ -777,9 +774,9 @@ Fonty rastrowe ISO-8859-13 o rozdzielczo %package 100dpi-ISO8859-14 Summary: ISO-8859-14 100dpi raster fonts Summary(pl): Fonty rastrowe ISO-8859-14 o rozdzielczo¶ci 100dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/100dpi +Requires(post,postun): fontpostinst %description 100dpi-ISO8859-14 ISO-8859-14 100dpi raster fonts. @@ -790,9 +787,9 @@ Fonty rastrowe ISO-8859-14 o rozdzielczo %package 100dpi-ISO8859-15 Summary: ISO-8859-15 100dpi raster fonts Summary(pl): Fonty rastrowe ISO-8859-15 o rozdzielczo¶ci 100dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/100dpi +Requires(post,postun): fontpostinst %description 100dpi-ISO8859-15 ISO-8859-15 100dpi raster fonts. @@ -803,9 +800,9 @@ Fonty rastrowe ISO-8859-15 o rozdzielczo %package 100dpi-JISX0201.1976-0 Summary: JISX0201.1976-0 100dpi raster fonts Summary(pl): Fonty rastrowe JISX0201.1976-0 o rozdzielczo¶ci 100dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/100dpi +Requires(post,postun): fontpostinst %description 100dpi-JISX0201.1976-0 JISX0201.1976-0 100dpi raster fonts. @@ -816,9 +813,9 @@ Fonty rastrowe JISX0201.1976-0 o rozdzielczo %package 100dpi-KOI8-R Summary: KOI8-R 100dpi raster fonts Summary(pl): Fonty rastrowe KOI8-R o rozdzielczo¶ci 100dpi -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/100dpi +Requires(post,postun): fontpostinst %description 100dpi-KOI8-R KOI8-R 100dpi raster fonts. @@ -829,10 +826,10 @@ Fonty rastrowe KOI8-R o rozdzielczo %package Ethiopic Summary: Ethiopic OpenType and TrueType fonts Summary(pl): Etiopskie fonty OpenType i TrueType -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/OTF Requires: %{_fontsdir}/TTF +Requires(post,postun): fontpostinst %description Ethiopic Ethiopic OpenType and TrueType fonts. @@ -844,9 +841,9 @@ Etiopskie fonty OpenType i TrueType. Summary: Syriac OpenType fonts Summary(pl): Starosyryjskie fonty OpenType License: distributable without modifications -Group: X11/XFree86 -Requires(post,postun): fontpostinst +Group: Fonts Requires: %{_fontsdir}/OTF +Requires(post,postun): fontpostinst %description Syriac Syriac OpenType fonts. @@ -860,7 +857,6 @@ Starosyryjskie fonty OpenType. %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 @@ -877,13 +873,14 @@ cd xc/fonts imake -DBuildFonts -DUseInstalled -I%{_libdir}/X11/config %{__make} Makefiles cd scaled -imake -DBuildFonts -DBuildEthiopicFonts -DBuildBethMarduthoFonts -DUseInstalled \ - -I%{_libdir}/X11/config +imake -DBuildFonts -DBuildEthiopicFonts -DBuildBethMarduthoFonts \ + -DUseInstalled -I%{_libdir}/X11/config %{__make} Makefiles cd .. %{__make} depend cd .. -%{__make} -C fonts TOP=`pwd` \ +%{__make} -C fonts \ + TOP=`pwd` \ UCS2ANY=`pwd`/fonts/util/ucs2any.pl \ BDFTRUNCATE=`pwd`/fonts/util/bdftruncate.pl \ UCSMAPPREFIX=`pwd`/fonts/util/map- \ @@ -891,13 +888,17 @@ cd .. %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_t1afmdir} + cd xc -%{__make} -C fonts install TOP=`pwd` \ +%{__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` \ +%{__make} -C fonts install.man \ + TOP=`pwd` \ UCS2ANY=`pwd`/fonts/util/ucs2any.pl \ BDFTRUNCATE=`pwd`/fonts/util/bdftruncate.pl \ UCSMAPPREFIX=`pwd`/fonts/util/map- \ @@ -905,7 +906,6 @@ cd xc cd .. # separate *.afm, convert *.pfa to .pfb -install -d $RPM_BUILD_ROOT%{_t1afmdir} mv -f $RPM_BUILD_ROOT%{_t1fontsdir}/*.afm $RPM_BUILD_ROOT%{_t1afmdir} cd $RPM_BUILD_ROOT%{_t1fontsdir} for f in *.pfa ; do @@ -1344,7 +1344,6 @@ fontpostinst OTF %{_fontsdir}/Speedo/fonts.scale.%{name} %ghost %{_fontsdir}/Speedo/fonts.dir -%dir %{_fontsdir}/TTF %{_fontsdir}/TTF/luxi*.ttf %ghost %{_fontsdir}/TTF/fonts.dir @@ -1357,7 +1356,6 @@ fontpostinst OTF %files base %defattr(644,root,root,755) -%dir %{_fontsdir}/misc %{_fontsdir}/misc/cursor.pcf.gz %{_fontsdir}/misc/6x13-ISO8859-1.pcf.gz %{_fontsdir}/misc/fonts.alias.00XFree86-fonts-base