rpms/xorg-x11-fonts
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Clean up SPEC file.

Browse Source 
Use _x11fontdir everywhere for fonts directories, 4 variables pointing to the same location.
This commit is contained in:
Simone Caronni 2014-11-09 18:03:44 +01:00
parent d105583764
commit b0cbac2f4c
1 changed files with 169 additions and 303 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

472
xorg-x11-fonts.spec
View File

@ -1,244 +1,247 @@
%define _catalogue /etc/X11/fontpath.d %define _catalogue /etc/X11/fontpath.d
# NOTE: Fonts strictly intended for X core fonts, should be installed into _x11fontdir.
# FIXME: The _sysfontdir stuff doesn't work yet, so don't use it. Once %define _x11fontdir %{_datadir}/X11/fonts
# upstream fonts have a build time configureable output directory that is
# a sane mechanism, we can rethink this.
%define _x11fontdirprefix %{_datadir}
# NOTE: Fonts strictly intended for X core fonts, should be installed
# into _x11fontdir.
%define _x11fontdir %{_x11fontdirprefix}/X11/fonts
%define _type1_fontdir %{_x11fontdir}
%define _otf_fontdir %{_x11fontdir}
%define _ttf_fontdir %{_x11fontdir}
# Configuration section # Configuration section
%define with_ethiopic_fonts 1 %define with_ethiopic_fonts 1
%if %{with_ethiopic_fonts} %if %{with_ethiopic_fonts}
%define ethiopic_fonts -a35 %define ethiopic_fonts -a35
%else %else
%define ethiopic_fonts "" %define ethiopic_fonts ""
%endif %endif
Summary: X.Org X11 fonts Summary: X.Org X11 fonts
Name: xorg-x11-fonts Name: xorg-x11-fonts
Version: 7.5 Version: 7.5
Release: 12%{?dist} Release: 12%{?dist}
License: MIT and Lucida and Public Domain License: MIT and Lucida and Public Domain
URL: http://www.x.org URL: http://www.x.org
BuildArch: noarch BuildArch: noarch
Source0: ftp://ftp.x.org/pub/individual/font/encodings-1.0.4.tar.bz2 Source0: http://www.x.org/pub/individual/font/encodings-1.0.4.tar.bz2
Source1: ftp://ftp.x.org/pub/individual/font/font-alias-1.0.3.tar.bz2 Source1: http://www.x.org/pub/individual/font/font-alias-1.0.3.tar.bz2
Source10: ftp://ftp.x.org/pub/individual/font/font-adobe-100dpi-1.0.3.tar.bz2 Source10: http://www.x.org/pub/individual/font/font-adobe-100dpi-1.0.3.tar.bz2
Source11: ftp://ftp.x.org/pub/individual/font/font-adobe-75dpi-1.0.3.tar.bz2 Source11: http://www.x.org/pub/individual/font/font-adobe-75dpi-1.0.3.tar.bz2
Source12: ftp://ftp.x.org/pub/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2 Source12: http://www.x.org/pub/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2
Source13: ftp://ftp.x.org/pub/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2 Source13: http://www.x.org/pub/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2
Source14: ftp://ftp.x.org/pub/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2 Source14: http://www.x.org/pub/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2
Source15: ftp://ftp.x.org/pub/individual/font/font-arabic-misc-1.0.3.tar.bz2 Source15: http://www.x.org/pub/individual/font/font-arabic-misc-1.0.3.tar.bz2
Source16: ftp://ftp.x.org/pub/individual/font/font-bh-100dpi-1.0.3.tar.bz2 Source16: http://www.x.org/pub/individual/font/font-bh-100dpi-1.0.3.tar.bz2
Source17: ftp://ftp.x.org/pub/individual/font/font-bh-75dpi-1.0.3.tar.bz2 Source17: http://www.x.org/pub/individual/font/font-bh-75dpi-1.0.3.tar.bz2
Source18: ftp://ftp.x.org/pub/individual/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2 Source18: http://www.x.org/pub/individual/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2
Source19: ftp://ftp.x.org/pub/individual/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2 Source19: http://www.x.org/pub/individual/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2
# Luxi fonts are under a bad license. # Luxi fonts are under a bad license.
# See: https://bugzilla.redhat.com/show_bug.cgi?id=317641 # See: https://bugzilla.redhat.com/show_bug.cgi?id=317641
# Source20: ftp://ftp.x.org/pub/individual/font/font-bh-ttf-1.0.0.tar.bz2 # Source20: http://www.x.org/pub/individual/font/font-bh-ttf-1.0.0.tar.bz2
# Source21: ftp://ftp.x.org/pub/individual/font/font-bh-type1-1.0.0.tar.bz2 # Source21: http://www.x.org/pub/individual/font/font-bh-type1-1.0.0.tar.bz2
Source22: ftp://ftp.x.org/pub/individual/font/font-bitstream-100dpi-1.0.3.tar.bz2 Source22: http://www.x.org/pub/individual/font/font-bitstream-100dpi-1.0.3.tar.bz2
Source23: ftp://ftp.x.org/pub/individual/font/font-bitstream-75dpi-1.0.3.tar.bz2 Source23: http://www.x.org/pub/individual/font/font-bitstream-75dpi-1.0.3.tar.bz2
Source25: ftp://ftp.x.org/pub/individual/font/font-bitstream-type1-1.0.3.tar.bz2 Source25: http://www.x.org/pub/individual/font/font-bitstream-type1-1.0.3.tar.bz2
Source26: ftp://ftp.x.org/pub/individual/font/font-cronyx-cyrillic-1.0.3.tar.bz2 Source26: http://www.x.org/pub/individual/font/font-cronyx-cyrillic-1.0.3.tar.bz2
Source27: ftp://ftp.x.org/pub/individual/font/font-cursor-misc-1.0.3.tar.bz2 Source27: http://www.x.org/pub/individual/font/font-cursor-misc-1.0.3.tar.bz2
Source28: ftp://ftp.x.org/pub/individual/font/font-daewoo-misc-1.0.3.tar.bz2 Source28: http://www.x.org/pub/individual/font/font-daewoo-misc-1.0.3.tar.bz2
Source29: ftp://ftp.x.org/pub/individual/font/font-dec-misc-1.0.3.tar.bz2 Source29: http://www.x.org/pub/individual/font/font-dec-misc-1.0.3.tar.bz2
# Source30: ftp://ftp.x.org/pub/individual/font/font-ibm-type1-1.0.0.tar.bz2 # Source30: http://www.x.org/pub/individual/font/font-ibm-type1-1.0.0.tar.bz2
Source31: ftp://ftp.x.org/pub/individual/font/font-isas-misc-1.0.3.tar.bz2 Source31: http://www.x.org/pub/individual/font/font-isas-misc-1.0.3.tar.bz2
Source32: ftp://ftp.x.org/pub/individual/font/font-jis-misc-1.0.3.tar.bz2 Source32: http://www.x.org/pub/individual/font/font-jis-misc-1.0.3.tar.bz2
Source33: ftp://ftp.x.org/pub/individual/font/font-micro-misc-1.0.3.tar.bz2 Source33: http://www.x.org/pub/individual/font/font-micro-misc-1.0.3.tar.bz2
Source34: ftp://ftp.x.org/pub/individual/font/font-misc-cyrillic-1.0.3.tar.bz2 Source34: http://www.x.org/pub/individual/font/font-misc-cyrillic-1.0.3.tar.bz2
%if %{with_ethiopic_fonts} %if %{with_ethiopic_fonts}
Source35: ftp://ftp.x.org/pub/individual/font/font-misc-ethiopic-1.0.3.tar.bz2 Source35: http://www.x.org/pub/individual/font/font-misc-ethiopic-1.0.3.tar.bz2
%endif %endif
# Source36: ftp://ftp.x.org/pub/individual/font/font-misc-meltho-1.0.0.tar.bz2 # Source36: http://www.x.org/pub/individual/font/font-misc-meltho-1.0.0.tar.bz2
Source37: ftp://ftp.x.org/pub/individual/font/font-misc-misc-1.1.2.tar.bz2 Source37: http://www.x.org/pub/individual/font/font-misc-misc-1.1.2.tar.bz2
Source38: ftp://ftp.x.org/pub/individual/font/font-mutt-misc-1.0.3.tar.bz2 Source38: http://www.x.org/pub/individual/font/font-mutt-misc-1.0.3.tar.bz2
Source39: ftp://ftp.x.org/pub/individual/font/font-schumacher-misc-1.1.2.tar.bz2 Source39: http://www.x.org/pub/individual/font/font-schumacher-misc-1.1.2.tar.bz2
Source40: ftp://ftp.x.org/pub/individual/font/font-screen-cyrillic-1.0.4.tar.bz2 Source40: http://www.x.org/pub/individual/font/font-screen-cyrillic-1.0.4.tar.bz2
Source41: ftp://ftp.x.org/pub/individual/font/font-sony-misc-1.0.3.tar.bz2 Source41: http://www.x.org/pub/individual/font/font-sony-misc-1.0.3.tar.bz2
Source42: ftp://ftp.x.org/pub/individual/font/font-sun-misc-1.0.3.tar.bz2 Source42: http://www.x.org/pub/individual/font/font-sun-misc-1.0.3.tar.bz2
Source43: ftp://ftp.x.org/pub/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2 Source43: http://www.x.org/pub/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2
Source44: ftp://ftp.x.org/pub/individual/font/font-xfree86-type1-1.0.4.tar.bz2 Source44: http://www.x.org/pub/individual/font/font-xfree86-type1-1.0.4.tar.bz2
Patch1: 0001-jisx0201.1976-0.enc-Add-undefined-mapping-for-0x7f-0.patch Patch1: 0001-jisx0201.1976-0.enc-Add-undefined-mapping-for-0x7f-0.patch
BuildRequires: pkgconfig BuildRequires: libtool
BuildRequires: xorg-x11-util-macros BuildRequires: pkgconfig
BuildRequires: xorg-x11-font-utils >= 7.5-3 BuildRequires: xorg-x11-util-macros
BuildRequires: autoconf automake libtool BuildRequires: xorg-x11-font-utils >= 7.5-3
BuildRequires: ucs2any, bdftruncate, bdftopcf BuildRequires: bdftopcf
BuildRequires: bdftruncate
BuildRequires: ucs2any
%description %description
X.Org X Window System fonts X.Org X Window System fonts.
%package misc %package misc
Summary: misc bitmap fonts for the X Window System Summary: misc bitmap fonts for the X Window System
Requires(post): mkfontdir, fontconfig Requires(post): fontconfig
Requires(postun): mkfontdir, fontconfig Requires(post): mkfontdir
Requires(postun): fontconfig
Requires(postun): mkfontdir
# Still required by xfig-common, xosd, xtide # Still required by xfig-common, xosd, xtide
Obsoletes: xorg-x11-fonts-base Obsoletes: xorg-x11-fonts-base <= %{version}-%{release}
Provides: xorg-x11-fonts-base Provides: xorg-x11-fonts-base = %{version}-%{release}
%description misc %description misc
This package contains misc bitmap Chinese, Japanese, Korean, Indic, and Arabic This package contains misc bitmap Chinese, Japanese, Korean, Indic, and Arabic
fonts for use with X Window System. fonts for use with X Window System.
#--------------------------------------------------------------------------
%package Type1 %package Type1
Summary: Type1 fonts provided by the X Window System Summary: Type1 fonts provided by the X Window System
Requires(post): mkfontdir, fontconfig, ttmkfdir Requires(post): fontconfig
Requires(postun): mkfontdir, fontconfig, ttmkfdir Requires(post): mkfontdir
Requires(post): ttmfkdir
Requires(postun): fontconfig
Requires(postun): mkfontdir
Requires(postun): ttmfkdir
%description Type1 %description Type1
A collection of Type1 fonts which are part of the core X Window System A collection of Type1 fonts which are part of the core X Window System
distribution. distribution.
#--------------------------------------------------------------------------
%if %{with_ethiopic_fonts} %if %{with_ethiopic_fonts}
%package ethiopic %package ethiopic
Summary: Ethiopic fonts Summary: Ethiopic fonts
Requires(post): mkfontdir, ttmkfdir, mkfontscale, fontconfig Requires(post): fontconfig
Requires(postun): mkfontdir, ttmkfdir, mkfontscale, fontconfig Requires(post): mkfontdir
Requires(post): mkfontscale
Requires(post): ttmfkdir
Requires(postun): fontconfig
Requires(postun): mkfontdir
Requires(postun): mkfontscale
Requires(postun): ttmfkdir
%description ethiopic %description ethiopic
Ethiopic fonts which are part of the core X Window System distribution. Ethiopic fonts which are part of the core X Window System distribution.
%endif %endif
#--------------------------------------------------------------------------
%package 75dpi %package 75dpi
Summary: A set of 75dpi resolution fonts for the X Window System. Summary: A set of 75dpi resolution fonts for the X Window System
Requires(post): mkfontdir Requires(post): mkfontdir
Requires(postun): mkfontdir Requires(postun): mkfontdir
%description 75dpi %description 75dpi
A set of 75 dpi fonts used by the X window system. A set of 75 dpi fonts used by the X window system.
#--------------------------------------------------------------------------
%package 100dpi %package 100dpi
Summary: A set of 100dpi resolution fonts for the X Window System. Summary: A set of 100dpi resolution fonts for the X Window System
Requires(post): mkfontdir Requires(post): mkfontdir
Requires(postun): mkfontdir Requires(postun): mkfontdir
%description 100dpi %description 100dpi
A set of 100 dpi fonts used by the X window system. A set of 100 dpi fonts used by the X window system.
#--------------------------------------------------------------------------
%package ISO8859-1-75dpi %package ISO8859-1-75dpi
Summary: A set of 75dpi ISO-8859-1 fonts for X. Summary: A set of 75dpi ISO-8859-1 fonts for X
Requires(post): mkfontdir Requires(post): mkfontdir
Requires(postun): mkfontdir Requires(postun): mkfontdir
%description ISO8859-1-75dpi %description ISO8859-1-75dpi
Contains a set of 75dpi fonts for ISO-8859-1. Contains a set of 75dpi fonts for ISO-8859-1.
#--------------------------------------------------------------------------
%package ISO8859-1-100dpi %package ISO8859-1-100dpi
Summary: A set of 100dpi ISO-8859-1 fonts for X. Summary: A set of 100dpi ISO-8859-1 fonts for X
Requires(post): mkfontdir Requires(post): mkfontdir
Requires(postun): mkfontdir Requires(postun): mkfontdir
%description ISO8859-1-100dpi %description ISO8859-1-100dpi
Contains a set of 100dpi fonts for ISO-8859-1. Contains a set of 100dpi fonts for ISO-8859-1.
#--------------------------------------------------------------------------
%package ISO8859-2-75dpi %package ISO8859-2-75dpi
Summary: A set of 75dpi Central European language fonts for X. Summary: A set of 75dpi Central European language fonts for X
Requires(post): mkfontdir Requires(post): mkfontdir
Requires(postun): mkfontdir Requires(postun): mkfontdir
%description ISO8859-2-75dpi %description ISO8859-2-75dpi
Contains a set of 75dpi fonts for Central European languages. Contains a set of 75dpi fonts for Central European languages.
#--------------------------------------------------------------------------
%package ISO8859-2-100dpi %package ISO8859-2-100dpi
Summary: A set of 100dpi Central European language fonts for X. Summary: A set of 100dpi Central European language fonts for X
Requires(post): mkfontdir Requires(post): mkfontdir
Requires(postun): mkfontdir Requires(postun): mkfontdir
%description ISO8859-2-100dpi %description ISO8859-2-100dpi
Contains a set of 100dpi fonts for Central European languages. Contains a set of 100dpi fonts for Central European languages.
#--------------------------------------------------------------------------
%package ISO8859-9-75dpi %package ISO8859-9-75dpi
Summary: ISO8859-9-75dpi fonts Summary: ISO8859-9-75dpi fonts
Requires(post): mkfontdir Requires(post): mkfontdir
Requires(postun): mkfontdir Requires(postun): mkfontdir
%description ISO8859-9-75dpi %description ISO8859-9-75dpi
Contains a set of 75dpi fonts for the Turkish language. Contains a set of 75dpi fonts for the Turkish language.
#--------------------------------------------------------------------------
%package ISO8859-9-100dpi %package ISO8859-9-100dpi
Summary: ISO8859-9-100dpi fonts Summary: ISO8859-9-100dpi fonts
Requires(post): mkfontdir Requires(post): mkfontdir
Requires(postun): mkfontdir Requires(postun): mkfontdir
%description ISO8859-9-100dpi %description ISO8859-9-100dpi
Contains a set of 100dpi fonts for the Turkish language. Contains a set of 100dpi fonts for the Turkish language.
#--------------------------------------------------------------------------
%package ISO8859-14-75dpi %package ISO8859-14-75dpi
Summary: ISO8859-14-75dpi fonts Summary: ISO8859-14-75dpi fonts
Requires(post): mkfontdir Requires(post): mkfontdir
Requires(postun): mkfontdir Requires(postun): mkfontdir
%description ISO8859-14-75dpi %description ISO8859-14-75dpi
Contains a set of 75dpi fonts in the ISO8859-14 encoding which Contains a set of 75dpi fonts in the ISO8859-14 encoding which provide Welsh
provide Welsh support. support.
#--------------------------------------------------------------------------
%package ISO8859-14-100dpi %package ISO8859-14-100dpi
Summary: ISO8859-14-100dpi fonts Summary: ISO8859-14-100dpi fonts
Requires(post): mkfontdir Requires(post): mkfontdir
Requires(postun): mkfontdir Requires(postun): mkfontdir
%description ISO8859-14-100dpi %description ISO8859-14-100dpi
Contains a set of 100dpi fonts in the ISO8859-14 encoding which Contains a set of 100dpi fonts in the ISO8859-14 encoding which provide Welsh
provide Welsh support. support.
#--------------------------------------------------------------------------
%package ISO8859-15-75dpi %package ISO8859-15-75dpi
Summary: ISO8859-15-75dpi fonts Summary: ISO8859-15-75dpi fonts
Requires(post): mkfontdir Requires(post): mkfontdir
Requires(postun): mkfontdir Requires(postun): mkfontdir
%description ISO8859-15-75dpi %description ISO8859-15-75dpi
Contains a set of 75dpi fonts in the ISO8859-15 encoding which Contains a set of 75dpi fonts in the ISO8859-15 encoding which provide Euro
provide Euro support. support.
#--------------------------------------------------------------------------
%package ISO8859-15-100dpi %package ISO8859-15-100dpi
Summary: ISO8859-15-100dpi fonts Summary: ISO8859-15-100dpi fonts
Requires(post): mkfontdir Requires(post): mkfontdir
Requires(postun): mkfontdir Requires(postun): mkfontdir
%description ISO8859-15-100dpi %description ISO8859-15-100dpi
Contains a set of 100dpi fonts in the ISO8859-15 encoding which Contains a set of 100dpi fonts in the ISO8859-15 encoding which provide Euro
provide Euro support. support.
#--------------------------------------------------------------------------
%package cyrillic %package cyrillic
Summary: Cyrillic fonts for X. Summary: Cyrillic fonts for X
Requires(post): mkfontdir Requires(post): mkfontdir
Requires(postun): mkfontdir Requires(postun): mkfontdir
%description cyrillic %description cyrillic
Contains a set of Cyrillic fonts. Contains a set of Cyrillic fonts.
#--------------------------------------------------------------------------
%prep %prep
%define setup_fonts_misc -a15 -a27 -a28 -a29 -a31 -a32 -a33 -a37 -a38 -a39 -a41 -a42 %define setup_fonts_misc -a15 -a27 -a28 -a29 -a31 -a32 -a33 -a37 -a38 -a39 -a41 -a42
%define setup_fonts_100dpi -a10 -a12 -a16 -a18 -a22 %define setup_fonts_100dpi -a10 -a12 -a16 -a18 -a22
%define setup_fonts_75dpi -a11 -a13 -a17 -a19 -a23 %define setup_fonts_75dpi -a11 -a13 -a17 -a19 -a23
%define setup_fonts_cyrillic -a26 -a34 -a40 -a43 %define setup_fonts_cyrillic -a26 -a34 -a40 -a43
%define setup_fonts_type1 -a14 -a25 -a44 %define setup_fonts_type1 -a14 -a25 -a44
%define setup_fonts_otf %{ethiopic_fonts} %define setup_fonts_otf %{ethiopic_fonts}
%define setup_fonts_bitmap %{setup_fonts_misc} %{setup_fonts_100dpi} %{setup_fonts_75dpi} %{setup_fonts_cyrillic}
%define setup_fonts_bitmap %{setup_fonts_misc} %{setup_fonts_100dpi} %{setup_fonts_75dpi} %{setup_fonts_cyrillic} %define setup_fonts_scaleable %{setup_fonts_type1} %{setup_fonts_otf}
%define setup_fonts_scaleable %{setup_fonts_type1} %{setup_fonts_otf} %define setup_font_metadata -a1
%define setup_font_metadata -a1
%setup -q -c %{name}-%{version} %{setup_font_metadata} %{setup_fonts_bitmap} %{setup_fonts_scaleable} %setup -q -c %{name}-%{version} %{setup_font_metadata} %{setup_fonts_bitmap} %{setup_fonts_scaleable}
pushd encodings-1.0.4 pushd encodings-1.0.4
%patch1 -p1 %patch1 -p1
popd popd
#--------------------------------------------------------------------------
%build %build
# Build all apps # Build all apps
{ {
@ -271,7 +274,7 @@ popd
done done
} }
#--------------------------------------------------------------------------
%install %install
# Install all apps # Install all apps
{ {
@ -315,9 +318,9 @@ done
done done
} }
#--------------------------------------------------------------------------
# xorg-x11-fonts-update-dirs is provided by xorg-x11-font-utils to # xorg-x11-fonts-update-dirs is provided by xorg-x11-font-utils to deduplicate
# deduplicate stuff run in %post # stuff run in %%post
%post misc %post misc
{ {
@ -340,7 +343,7 @@ done
%postun Type1 %postun Type1
{ {
FONTDIR=%{_type1_fontdir}/Type1 FONTDIR=%{_x11fontdir}/Type1
if [ "$1" = "0" -a -d $FONTDIR ]; then if [ "$1" = "0" -a -d $FONTDIR ]; then
xorg-x11-fonts-update-dirs $FONTDIR xorg-x11-fonts-update-dirs $FONTDIR
fi fi
@ -349,17 +352,17 @@ done
%if %{with_ethiopic_fonts} %if %{with_ethiopic_fonts}
%post ethiopic %post ethiopic
{ {
xorg-x11-fonts-update-dirs --skip-fontscale --need-ttmkfdir %{_ttf_fontdir}/TTF xorg-x11-fonts-update-dirs --skip-fontscale --need-ttmkfdir %{_x11fontdir}/TTF
xorg-x11-fonts-update-dirs %{_ttf_fontdir}/OTF xorg-x11-fonts-update-dirs %{_x11fontdir}/OTF
} }
%postun ethiopic %postun ethiopic
{ {
FONTDIR=%{_ttf_fontdir}/TTF FONTDIR=%{_x11fontdir}/TTF
if [ "$1" = "0" -a -d $FONTDIR ]; then if [ "$1" = "0" -a -d $FONTDIR ]; then
xorg-x11-fonts-update-dirs --skip-fontscale --need-ttmkfdir $FONTDIR xorg-x11-fonts-update-dirs --skip-fontscale --need-ttmkfdir $FONTDIR
fi fi
FONTDIR=%{_otf_fontdir}/OTF FONTDIR=%{_x11fontdir}/OTF
if [ "$1" = "0" -a -d $FONTDIR ]; then if [ "$1" = "0" -a -d $FONTDIR ]; then
xorg-x11-fonts-update-dirs $FONTDIR xorg-x11-fonts-update-dirs $FONTDIR
fi fi
@ -496,22 +499,21 @@ mkfontdir %{_x11fontdir}/cyrillic
fi fi
} }
#--------------------------------------------------------------------------
%files misc %files misc
%{_catalogue}/xorg-x11-fonts-misc:unscaled:pri=10 %{_catalogue}/xorg-x11-fonts-misc:unscaled:pri=10
%dir %{_x11fontdir}/misc %dir %{_x11fontdir}/misc
%{_x11fontdir}/misc/* %{_x11fontdir}/misc/*
%dir %{_datadir}/X11/fonts/encodings %dir %{_x11fontdir}/encodings
%dir %{_datadir}/X11/fonts/encodings/large %dir %{_x11fontdir}/encodings/large
%{_datadir}/X11/fonts/encodings/*.enc.gz %{_x11fontdir}/encodings/*.enc.gz
%ghost %verify(not md5 size mtime) %{_datadir}/X11/fonts/encodings/encodings.dir %ghost %verify(not md5 size mtime) %{_x11fontdir}/encodings/encodings.dir
%{_datadir}/X11/fonts/encodings/large/*.enc.gz %{_x11fontdir}/encodings/large/*.enc.gz
%ghost %verify(not md5 size mtime) %{_datadir}/X11/fonts/encodings/large/encodings.dir %ghost %verify(not md5 size mtime) %{_x11fontdir}/encodings/large/encodings.dir
%ghost %verify(not md5 size mtime) %{_x11fontdir}/misc/encodings.dir %ghost %verify(not md5 size mtime) %{_x11fontdir}/misc/encodings.dir
%ghost %verify(not md5 size mtime) %{_x11fontdir}/misc/fonts.dir %ghost %verify(not md5 size mtime) %{_x11fontdir}/misc/fonts.dir
# NOTE: Xorg supplies this fonts.alias, so it is not ghosted # NOTE: Xorg supplies this fonts.alias, so it is not ghosted
%verify(not md5 size mtime) %{_x11fontdir}/misc/fonts.alias %verify(not md5 size mtime) %{_x11fontdir}/misc/fonts.alias
#%ghost %attr(644,root,root) %verify(not md5 size mtime) %{_x11fontdir}/misc/fonts.scale
%ghost %verify(not md5 size mtime) %{_x11fontdir}/misc/fonts.scale %ghost %verify(not md5 size mtime) %{_x11fontdir}/misc/fonts.scale
%ghost %verify(not md5 size mtime) %{_x11fontdir}/misc/fonts.cache-* %ghost %verify(not md5 size mtime) %{_x11fontdir}/misc/fonts.cache-*
@ -574,7 +576,6 @@ mkfontdir %{_x11fontdir}/cyrillic
# NOTE: Xorg supplies this fonts.alias, so it is not ghosted # NOTE: Xorg supplies this fonts.alias, so it is not ghosted
%verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.alias %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.alias
%ghost %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.scale %ghost %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.scale
#%ghost %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.cache
%ghost %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.cache-* %ghost %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.cache-*
%files 100dpi %files 100dpi
@ -613,7 +614,6 @@ mkfontdir %{_x11fontdir}/cyrillic
# NOTE: Xorg supplies this fonts.alias, so it is not ghosted # NOTE: Xorg supplies this fonts.alias, so it is not ghosted
%verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.alias %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.alias
%ghost %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.scale %ghost %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.scale
#%ghost %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.cache
%ghost %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.cache-* %ghost %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.cache-*
%files ISO8859-1-75dpi %files ISO8859-1-75dpi
@ -644,7 +644,6 @@ mkfontdir %{_x11fontdir}/cyrillic
# NOTE: Xorg supplies this fonts.alias, so it is not ghosted # NOTE: Xorg supplies this fonts.alias, so it is not ghosted
%verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.alias %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.alias
%ghost %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.scale %ghost %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.scale
#%ghost %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.cache
%ghost %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.cache-* %ghost %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.cache-*
%files ISO8859-1-100dpi %files ISO8859-1-100dpi
@ -675,7 +674,6 @@ mkfontdir %{_x11fontdir}/cyrillic
# NOTE: Xorg supplies this fonts.alias, so it is not ghosted # NOTE: Xorg supplies this fonts.alias, so it is not ghosted
%verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.alias %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.alias
%ghost %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.scale %ghost %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.scale
#%ghost %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.cache
%ghost %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.cache-* %ghost %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.cache-*
%files ISO8859-2-75dpi %files ISO8859-2-75dpi
@ -706,7 +704,6 @@ mkfontdir %{_x11fontdir}/cyrillic
# NOTE: Xorg supplies this fonts.alias, so it is not ghosted # NOTE: Xorg supplies this fonts.alias, so it is not ghosted
%verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.alias %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.alias
%ghost %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.scale %ghost %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.scale
#%ghost %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.cache
%ghost %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.cache-* %ghost %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.cache-*
%files ISO8859-2-100dpi %files ISO8859-2-100dpi
@ -737,7 +734,6 @@ mkfontdir %{_x11fontdir}/cyrillic
# NOTE: Xorg supplies this fonts.alias, so it is not ghosted # NOTE: Xorg supplies this fonts.alias, so it is not ghosted
%verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.alias %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.alias
%ghost %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.scale %ghost %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.scale
#%ghost %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.cache
%ghost %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.cache-* %ghost %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.cache-*
%files ISO8859-9-75dpi %files ISO8859-9-75dpi
@ -768,7 +764,6 @@ mkfontdir %{_x11fontdir}/cyrillic
# NOTE: Xorg supplies this fonts.alias, so it is not ghosted # NOTE: Xorg supplies this fonts.alias, so it is not ghosted
%verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.alias %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.alias
%ghost %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.scale %ghost %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.scale
#%ghost %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.cache
%ghost %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.cache-* %ghost %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.cache-*
%files ISO8859-9-100dpi %files ISO8859-9-100dpi
@ -799,7 +794,6 @@ mkfontdir %{_x11fontdir}/cyrillic
# NOTE: Xorg supplies this fonts.alias, so it is not ghosted # NOTE: Xorg supplies this fonts.alias, so it is not ghosted
%verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.alias %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.alias
%ghost %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.scale %ghost %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.scale
#%ghost %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.cache
%ghost %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.cache-* %ghost %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.cache-*
%files ISO8859-14-75dpi %files ISO8859-14-75dpi
@ -830,7 +824,6 @@ mkfontdir %{_x11fontdir}/cyrillic
# NOTE: Xorg supplies this fonts.alias, so it is not ghosted # NOTE: Xorg supplies this fonts.alias, so it is not ghosted
%verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.alias %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.alias
%ghost %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.scale %ghost %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.scale
#%ghost %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.cache
%ghost %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.cache-* %ghost %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.cache-*
%files ISO8859-14-100dpi %files ISO8859-14-100dpi
@ -861,7 +854,6 @@ mkfontdir %{_x11fontdir}/cyrillic
# NOTE: Xorg supplies this fonts.alias, so it is not ghosted # NOTE: Xorg supplies this fonts.alias, so it is not ghosted
%verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.alias %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.alias
%ghost %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.scale %ghost %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.scale
#%ghost %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.cache
%ghost %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.cache-* %ghost %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.cache-*
%files ISO8859-15-75dpi %files ISO8859-15-75dpi
@ -892,7 +884,6 @@ mkfontdir %{_x11fontdir}/cyrillic
# NOTE: Xorg supplies this fonts.alias, so it is not ghosted # NOTE: Xorg supplies this fonts.alias, so it is not ghosted
%verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.alias %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.alias
%ghost %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.scale %ghost %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.scale
#%ghost %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.cache
%ghost %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.cache-* %ghost %verify(not md5 size mtime) %{_x11fontdir}/75dpi/fonts.cache-*
%files ISO8859-15-100dpi %files ISO8859-15-100dpi
@ -923,7 +914,6 @@ mkfontdir %{_x11fontdir}/cyrillic
# NOTE: Xorg supplies this fonts.alias, so it is not ghosted # NOTE: Xorg supplies this fonts.alias, so it is not ghosted
%verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.alias %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.alias
%ghost %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.scale %ghost %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.scale
#%ghost %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.cache
%ghost %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.cache-* %ghost %verify(not md5 size mtime) %{_x11fontdir}/100dpi/fonts.cache-*
%files Type1 %files Type1
@ -941,9 +931,7 @@ mkfontdir %{_x11fontdir}/cyrillic
%{_x11fontdir}/Type1/cursor.pfa %{_x11fontdir}/Type1/cursor.pfa
%ghost %verify(not md5 size mtime) %{_x11fontdir}/Type1/encodings.dir %ghost %verify(not md5 size mtime) %{_x11fontdir}/Type1/encodings.dir
%ghost %verify(not md5 size mtime) %{_x11fontdir}/Type1/fonts.dir %ghost %verify(not md5 size mtime) %{_x11fontdir}/Type1/fonts.dir
#%ghost %verify(not md5 size mtime) %{_x11fontdir}/Type1/fonts.alias
%ghost %verify(not md5 size mtime) %{_x11fontdir}/Type1/fonts.scale %ghost %verify(not md5 size mtime) %{_x11fontdir}/Type1/fonts.scale
#%ghost %verify(not md5 size mtime) %{_x11fontdir}/Type1/fonts.cache
%ghost %verify(not md5 size mtime) %{_x11fontdir}/Type1/fonts.cache-* %ghost %verify(not md5 size mtime) %{_x11fontdir}/Type1/fonts.cache-*
%files cyrillic %files cyrillic
@ -974,7 +962,7 @@ mkfontdir %{_x11fontdir}/cyrillic
%changelog %changelog
* Sun Nov 09 2014 Simone Caronni <negativo17@gmail.com> - 7.5-12 * Sun Nov 09 2014 Simone Caronni <negativo17@gmail.com> - 7.5-12
- Clean up SPEC file. - Clean up SPEC file, remove obsolete tags, fix all rpmlint warnings.
- Rework build/install section to be like other xorg packages. - Rework build/install section to be like other xorg packages.
- Remove all obsolete provides/obsoletes/conflicts. - Remove all obsolete provides/obsoletes/conflicts.
@ -1049,7 +1037,7 @@ mkfontdir %{_x11fontdir}/cyrillic
- Fix bashism in spec file (&>) - Fix bashism in spec file (&>)
- Remove perl hack for DEFAULT_FONTS_DIR, fixed upstream - Remove perl hack for DEFAULT_FONTS_DIR, fixed upstream
- Remove perl and autoconf requirement. - Remove perl and autoconf requirement.
- Create %ghost files {misc|705dpi|...}/fonts.scale. - Create %%ghost files {misc|705dpi|...}/fonts.scale.
- Drop fontdir alias patches - Drop fontdir alias patches
- Update a few fonts (well, all of them) - Update a few fonts (well, all of them)
- encodings-1.0.3 - encodings-1.0.3
@ -1087,125 +1075,3 @@ mkfontdir %{_x11fontdir}/cyrillic
* Fri Mar 05 2010 Matěj Cepl <mcepl@redhat.com> - 7.2-10 * Fri Mar 05 2010 Matěj Cepl <mcepl@redhat.com> - 7.2-10
- Fixed bad directory ownership of /etc//X11/fontpath.d - Fixed bad directory ownership of /etc//X11/fontpath.d
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.2-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Thu Feb 26 2009 Adam Jackson <ajax@redhat.com> 7.2-8
- Yet another rebuild attempt.
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Mon Jan 14 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 7.2-6
- IBM refused to relicense ibm-type1 fonts with permission to modify,
so they were dropped (bugzilla 317641)
- Meltho Syrian fonts (misc-meltho) have a bad license, upstream did not
respond to request for relicensing, so they were dropped. This also
means that the -syriac subpackage has been removed. (bugzilla 317641)
* Tue Dec 18 2007 Tom "spot" Callaway <tcallawa@redhat.com> - 7.2-5
- Remove bh-ttf and bh-type1 (Luxi fonts) and truetype subpackage, due to
licensing issues (#317641)
- Correct license tag
* Mon Nov 19 2007 Kristian Høgsberg <krh@redhat.com> - 7.2-4
- Quote percentage signs in symlinking bash-magic (#390171).
* Mon Aug 27 2007 Adam Jackson <ajax@redhat.com> 7.2-3
- Fix build for F8, don't leave references to RPM_BUILD_ROOT in the
encodings output. (#251058)
* Fri Jul 06 2007 Florian La Roche <laroche@redhat.com> - 7.2-2
- add fontconfig dep foer misc post/postun
* Fri Jun 22 2007 Kristian Høgsberg <krh@redhat.com> - 7.2-1
- Use the new catalogue font install mechanism, drop all chkfontpath dependencies.
- Unsplit base and misc subpackages, we don't require any base fonts
now that we have built-ins.
* Fri Dec 8 2006 Adam Jackson <ajax@redhat.com> 7.1-3
- Create encodings.dir containing entries for both
%{_datadir}/X11/fonts/encodings and
%{_datadir}/X11/fonts/encodings/large (#209102).
* Thu Aug 31 2006 Kristian Høgsberg <krh@redhat.com> 7.1-2
- Fix postun scripts to only run if the directory is still there (#197208).
* Wed Jun 21 2006 Mike A. Harris <mharris@redhat.com> 7.1-1
- Added "BuildRequires: autoconf" temporary dependency.
- Use Fedora Extras style BuildRoot specification.
* Fri May 26 2006 Mike A. Harris <mharris@redhat.com> 7.0-4
- Added "BuildRequires: fontconfig" for (#192038)
* Sat Mar 04 2006 Mike A. Harris <mharris@redhat.com> 7.0-3
- Ensure upgrade-only section of fonts-base rpm post script only executes on
upgrades using -gt instead of -ge.
* Fri Feb 24 2006 Mike A. Harris <mharris@redhat.com> 7.0-2
- Generate encodings.dir files in the encodings dirs with mkfontscale from the
base fonts package post install script, to work around bug (#173875)
* Thu Jan 26 2006 Mike A. Harris <mharris@redhat.com> 7.0-1
- Bumped artificial package version to 7.0, to indicate that the font tarballs
are all from X11R7.0.
- Enabled the ethiopic font subpackage experimentally for bug (#176678)
* Tue Jan 17 2006 Mike A. Harris <mharris@redhat.com> 1.0.0-3
- Added missing post/postun scripts for ISO8859-1-75dpi and ISO8859-1-100dpi
font packages. (#174416)
* Tue Jan 10 2006 Bill Nottingham <notting@redhat.com> 1.0.0-2
- fix obsoletes (#177377)
* Thu Dec 15 2005 Mike A. Harris <mharris@redhat.com> 1.0.0-1
- Updated all font packages to X11R7 RC4 versions.
- Added perl hack to build section to massage all of the configure.ac files
to use pkgconfig to autodetect the top level X fontdir.
- Added font-alias-1.0.0-fonts-alias-fontdir-fix.patch to use pkgconfig to
autodetect the top level X fontdir.
- Added encodings-1.0.0-encodings-fontdir-fix.patch to use pkgconfig to
autodetect the top level X fontdir.
- Use new --disable-iso8859-* options instead of deleting unwanted encodings.
- Added dependency on font-utils 1.0.0
* Tue Dec 13 2005 Mike A. Harris <mharris@redhat.com> 0.99.3-1
- Updated all font packages to X11R7 RC3 versions.
* Fri Nov 25 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-8
- Due to a bug in chkfontpath which will remove both 'misc' and 'misc:unscaled'
from the fontpath, use sed magic to do it instead, based of xfs scripts.
* Wed Nov 23 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-7
- Undo the workaround implemented in build 0.99.0-5, and make the misc fonts
directory ":unscaled" again.
- Invoke chkfontpath to remove the bare 'misc' font path without the :unscaled
attribute from xfs config.
* Mon Nov 14 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-6
- Fixed mkfontscale invocation in Type1 font subpackage post/postun scripts
by removing accidental -o argument that creeped in via cut and paste
error. (#173059)
* Sun Nov 13 2005 Jeremy Katz <katzj@redhat.com> - 0.99.0-5
- don't use :unscaled for base fonts as a temporary workaround for #172997
* Wed Nov 9 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-4
- Added Obsoletes/Conflicts lines for fonts-xorg-* et al. to all subpackages,
so that OS upgrades work properly.
* Tue Nov 8 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-3
- Split the old style 'base' fonts package up into 'base' and 'misc', where
'base' now contains only the 'cursor' and 'fixed' fonts required by the
X server, and 'misc' contains a variety of Asian, Arabic, Indic, and other
fonts that can now be optionally installed or removed.
- Use globs in file manifests to reduce size of specfile.
- Add post/postun scripts for all font subpackages.
- Disable ethiopic fonts by default.
* Mon Nov 7 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-2
- Added "BuildArch: noarch" so that all fonts are noarch.
* Tue Oct 25 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-1
- Initial packaging.