Simplify build requirements and build
This commit is contained in:
Simone Caronni
parent
b0cbac2f4c
commit
4910dc8dd5
@ -2,14 +2,6 @@
|
||||
# NOTE: Fonts strictly intended for X core fonts, should be installed into _x11fontdir.
|
||||
%define _x11fontdir %{_datadir}/X11/fonts
|
||||
|
||||
# Configuration section
|
||||
%define with_ethiopic_fonts 1
|
||||
%if %{with_ethiopic_fonts}
|
||||
%define ethiopic_fonts -a35
|
||||
%else
|
||||
%define ethiopic_fonts ""
|
||||
%endif
|
||||
|
||||
Summary: X.Org X11 fonts
|
||||
Name: xorg-x11-fonts
|
||||
Version: 7.5
|
||||
@ -20,55 +12,56 @@ URL: http://www.x.org
|
||||
BuildArch: noarch
|
||||
|
||||
Source0: http://www.x.org/pub/individual/font/encodings-1.0.4.tar.bz2
|
||||
Source1: http://www.x.org/pub/individual/font/font-alias-1.0.3.tar.bz2
|
||||
Source10: http://www.x.org/pub/individual/font/font-adobe-100dpi-1.0.3.tar.bz2
|
||||
Source11: http://www.x.org/pub/individual/font/font-adobe-75dpi-1.0.3.tar.bz2
|
||||
Source12: http://www.x.org/pub/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2
|
||||
Source13: http://www.x.org/pub/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2
|
||||
Source14: http://www.x.org/pub/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2
|
||||
Source15: http://www.x.org/pub/individual/font/font-arabic-misc-1.0.3.tar.bz2
|
||||
Source16: http://www.x.org/pub/individual/font/font-bh-100dpi-1.0.3.tar.bz2
|
||||
Source17: http://www.x.org/pub/individual/font/font-bh-75dpi-1.0.3.tar.bz2
|
||||
Source18: http://www.x.org/pub/individual/font/font-bh-lucidatypewriter-100dpi-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.
|
||||
# See: https://bugzilla.redhat.com/show_bug.cgi?id=317641
|
||||
# Source20: http://www.x.org/pub/individual/font/font-bh-ttf-1.0.0.tar.bz2
|
||||
# Source21: http://www.x.org/pub/individual/font/font-bh-type1-1.0.0.tar.bz2
|
||||
Source22: http://www.x.org/pub/individual/font/font-bitstream-100dpi-1.0.3.tar.bz2
|
||||
Source23: http://www.x.org/pub/individual/font/font-bitstream-75dpi-1.0.3.tar.bz2
|
||||
Source25: http://www.x.org/pub/individual/font/font-bitstream-type1-1.0.3.tar.bz2
|
||||
Source26: http://www.x.org/pub/individual/font/font-cronyx-cyrillic-1.0.3.tar.bz2
|
||||
Source27: http://www.x.org/pub/individual/font/font-cursor-misc-1.0.3.tar.bz2
|
||||
Source28: http://www.x.org/pub/individual/font/font-daewoo-misc-1.0.3.tar.bz2
|
||||
Source29: http://www.x.org/pub/individual/font/font-dec-misc-1.0.3.tar.bz2
|
||||
# Source30: http://www.x.org/pub/individual/font/font-ibm-type1-1.0.0.tar.bz2
|
||||
Source31: http://www.x.org/pub/individual/font/font-isas-misc-1.0.3.tar.bz2
|
||||
Source32: http://www.x.org/pub/individual/font/font-jis-misc-1.0.3.tar.bz2
|
||||
Source33: http://www.x.org/pub/individual/font/font-micro-misc-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}
|
||||
Source35: http://www.x.org/pub/individual/font/font-misc-ethiopic-1.0.3.tar.bz2
|
||||
%endif
|
||||
# Source36: http://www.x.org/pub/individual/font/font-misc-meltho-1.0.0.tar.bz2
|
||||
Source37: http://www.x.org/pub/individual/font/font-misc-misc-1.1.2.tar.bz2
|
||||
Source38: http://www.x.org/pub/individual/font/font-mutt-misc-1.0.3.tar.bz2
|
||||
Source39: http://www.x.org/pub/individual/font/font-schumacher-misc-1.1.2.tar.bz2
|
||||
Source40: http://www.x.org/pub/individual/font/font-screen-cyrillic-1.0.4.tar.bz2
|
||||
Source41: http://www.x.org/pub/individual/font/font-sony-misc-1.0.3.tar.bz2
|
||||
Source42: http://www.x.org/pub/individual/font/font-sun-misc-1.0.3.tar.bz2
|
||||
Source43: http://www.x.org/pub/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2
|
||||
Source44: http://www.x.org/pub/individual/font/font-xfree86-type1-1.0.4.tar.bz2
|
||||
Source1: http://www.x.org/pub/individual/font/font-adobe-100dpi-1.0.3.tar.bz2
|
||||
Source2: http://www.x.org/pub/individual/font/font-adobe-75dpi-1.0.3.tar.bz2
|
||||
Source3: http://www.x.org/pub/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2
|
||||
Source4: http://www.x.org/pub/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2
|
||||
Source5: http://www.x.org/pub/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2
|
||||
Source6: http://www.x.org/pub/individual/font/font-alias-1.0.3.tar.bz2
|
||||
Source7: http://www.x.org/pub/individual/font/font-arabic-misc-1.0.3.tar.bz2
|
||||
Source8: http://www.x.org/pub/individual/font/font-bh-100dpi-1.0.3.tar.bz2
|
||||
Source9: http://www.x.org/pub/individual/font/font-bh-75dpi-1.0.3.tar.bz2
|
||||
Source10: http://www.x.org/pub/individual/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2
|
||||
Source11: http://www.x.org/pub/individual/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2
|
||||
Source12: http://www.x.org/pub/individual/font/font-bitstream-100dpi-1.0.3.tar.bz2
|
||||
Source13: http://www.x.org/pub/individual/font/font-bitstream-75dpi-1.0.3.tar.bz2
|
||||
Source14: http://www.x.org/pub/individual/font/font-bitstream-type1-1.0.3.tar.bz2
|
||||
Source15: http://www.x.org/pub/individual/font/font-cronyx-cyrillic-1.0.3.tar.bz2
|
||||
Source16: http://www.x.org/pub/individual/font/font-cursor-misc-1.0.3.tar.bz2
|
||||
Source17: http://www.x.org/pub/individual/font/font-daewoo-misc-1.0.3.tar.bz2
|
||||
Source18: http://www.x.org/pub/individual/font/font-dec-misc-1.0.3.tar.bz2
|
||||
Source19: http://www.x.org/pub/individual/font/font-isas-misc-1.0.3.tar.bz2
|
||||
Source20: http://www.x.org/pub/individual/font/font-jis-misc-1.0.3.tar.bz2
|
||||
Source21: http://www.x.org/pub/individual/font/font-micro-misc-1.0.3.tar.bz2
|
||||
Source22: http://www.x.org/pub/individual/font/font-misc-cyrillic-1.0.3.tar.bz2
|
||||
Source23: http://www.x.org/pub/individual/font/font-misc-ethiopic-1.0.3.tar.bz2
|
||||
Source24: http://www.x.org/pub/individual/font/font-misc-misc-1.1.2.tar.bz2
|
||||
Source25: http://www.x.org/pub/individual/font/font-mutt-misc-1.0.3.tar.bz2
|
||||
Source26: http://www.x.org/pub/individual/font/font-schumacher-misc-1.1.2.tar.bz2
|
||||
Source27: http://www.x.org/pub/individual/font/font-screen-cyrillic-1.0.4.tar.bz2
|
||||
Source28: http://www.x.org/pub/individual/font/font-sony-misc-1.0.3.tar.bz2
|
||||
Source29: http://www.x.org/pub/individual/font/font-sun-misc-1.0.3.tar.bz2
|
||||
Source30: http://www.x.org/pub/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2
|
||||
Source31: http://www.x.org/pub/individual/font/font-xfree86-type1-1.0.4.tar.bz2
|
||||
|
||||
# Luxi fonts are under a bad license
|
||||
# http://www.x.org/pub/individual/font/font-bh-ttf-1.0.0.tar.bz2
|
||||
# http://www.x.org/pub/individual/font/font-bh-type1-1.0.0.tar.bz2
|
||||
|
||||
# IBM refused to relicense ibm-type1 fonts with permission to modify
|
||||
# http://www.x.org/pub/individual/font/font-ibm-type1-1.0.0.tar.bz2
|
||||
|
||||
# Meltho Syrian fonts (misc-meltho) have a bad license, upstream did not respond
|
||||
# to request for relicensing
|
||||
# http://www.x.org/pub/individual/font/font-misc-meltho-1.0.0.tar.bz2
|
||||
|
||||
Patch1: 0001-jisx0201.1976-0.enc-Add-undefined-mapping-for-0x7f-0.patch
|
||||
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: xorg-x11-util-macros
|
||||
BuildRequires: xorg-x11-font-utils >= 7.5-3
|
||||
BuildRequires: pkgconfig(xorg-macros) >= 1.3
|
||||
# This should be font-util = 1.1.0 but xorg-x11-font-utils does not provide it.
|
||||
BuildRequires: xorg-x11-font-utils >= 7.2-11
|
||||
|
||||
BuildRequires: bdftopcf
|
||||
BuildRequires: bdftruncate
|
||||
BuildRequires: ucs2any
|
||||
|
||||
%description
|
||||
@ -101,7 +94,6 @@ Requires(postun): ttmfkdir
|
||||
A collection of Type1 fonts which are part of the core X Window System
|
||||
distribution.
|
||||
|
||||
%if %{with_ethiopic_fonts}
|
||||
%package ethiopic
|
||||
Summary: Ethiopic fonts
|
||||
Requires(post): fontconfig
|
||||
@ -115,7 +107,6 @@ Requires(postun): ttmfkdir
|
||||
|
||||
%description ethiopic
|
||||
Ethiopic fonts which are part of the core X Window System distribution.
|
||||
%endif
|
||||
|
||||
%package 75dpi
|
||||
Summary: A set of 75dpi resolution fonts for the X Window System
|
||||
@ -226,17 +217,11 @@ Requires(postun): mkfontdir
|
||||
Contains a set of Cyrillic fonts.
|
||||
|
||||
%prep
|
||||
%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_75dpi -a11 -a13 -a17 -a19 -a23
|
||||
%define setup_fonts_cyrillic -a26 -a34 -a40 -a43
|
||||
%define setup_fonts_type1 -a14 -a25 -a44
|
||||
%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_scaleable %{setup_fonts_type1} %{setup_fonts_otf}
|
||||
%define setup_font_metadata -a1
|
||||
%setup -q -c %{name}-%{version} \
|
||||
-a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 \
|
||||
-a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 \
|
||||
-a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30 -a31
|
||||
|
||||
%setup -q -c %{name}-%{version} %{setup_font_metadata} %{setup_fonts_bitmap} %{setup_fonts_scaleable}
|
||||
pushd encodings-1.0.4
|
||||
%patch1 -p1
|
||||
popd
|
||||
@ -291,16 +276,16 @@ for f in misc:unscaled:pri=10 75dpi:unscaled:pri=20 100dpi:unscaled:pri=30 Type1
|
||||
ln -fs %{_x11fontdir}/${f%%%%:*} $RPM_BUILD_ROOT%{_catalogue}/xorg-x11-fonts-$f
|
||||
done
|
||||
|
||||
# Create fake %ghost files for file manifests.
|
||||
# Create fake ghost files for file manifests.
|
||||
{
|
||||
# Make ghost fonts.alias, fonts.dir, encodings.dir files
|
||||
FONTDIR=$RPM_BUILD_ROOT%{_x11fontdir}
|
||||
# Create fake %ghost fonts.alias
|
||||
# Create fake %%ghost fonts.alias
|
||||
for subdir in TTF OTF ; do
|
||||
touch $FONTDIR/$subdir/fonts.{alias,scale}
|
||||
chmod 0644 $FONTDIR/$subdir/fonts.{alias,scale}
|
||||
done
|
||||
# Create fake %ghost encodings.dir, fonts.dir, fonts.scale, fonts.cache-*
|
||||
# Create fake ghost encodings.dir, fonts.dir, fonts.scale, fonts.cache-*
|
||||
for subdir in Type1 TTF OTF 100dpi 75dpi cyrillic misc ; do
|
||||
rm -f $FONTDIR/$subdir/{encodings,fonts}.dir
|
||||
touch $FONTDIR/$subdir/{encodings,fonts}.dir
|
||||
@ -349,7 +334,6 @@ done
|
||||
fi
|
||||
}
|
||||
|
||||
%if %{with_ethiopic_fonts}
|
||||
%post ethiopic
|
||||
{
|
||||
xorg-x11-fonts-update-dirs --skip-fontscale --need-ttmkfdir %{_x11fontdir}/TTF
|
||||
@ -367,7 +351,6 @@ done
|
||||
xorg-x11-fonts-update-dirs $FONTDIR
|
||||
fi
|
||||
}
|
||||
%endif
|
||||
|
||||
%post 75dpi
|
||||
mkfontdir %{_x11fontdir}/75dpi
|
||||
@ -517,7 +500,6 @@ mkfontdir %{_x11fontdir}/cyrillic
|
||||
%ghost %verify(not md5 size mtime) %{_x11fontdir}/misc/fonts.scale
|
||||
%ghost %verify(not md5 size mtime) %{_x11fontdir}/misc/fonts.cache-*
|
||||
|
||||
%if %{with_ethiopic_fonts}
|
||||
%files ethiopic
|
||||
%{_catalogue}/xorg-x11-fonts-TTF
|
||||
%{_catalogue}/xorg-x11-fonts-OTF
|
||||
@ -538,7 +520,6 @@ mkfontdir %{_x11fontdir}/cyrillic
|
||||
%ghost %verify(not md5 size mtime) %{_x11fontdir}/OTF/fonts.alias
|
||||
%ghost %verify(not md5 size mtime) %{_x11fontdir}/OTF/fonts.scale
|
||||
%ghost %verify(not md5 size mtime) %{_x11fontdir}/OTF/fonts.cache-*
|
||||
%endif
|
||||
|
||||
%files 75dpi
|
||||
%{_catalogue}/xorg-x11-fonts-75dpi:unscaled:pri=20
|
||||
@ -925,8 +906,8 @@ mkfontdir %{_x11fontdir}/cyrillic
|
||||
%{_x11fontdir}/Type1/c0???bt_.[ap]f[mb]
|
||||
# font-ibm-type1
|
||||
# Pulled for licensing reasons (see bz 317641)
|
||||
# %{_x11fontdir}/Type1/cour*.afm
|
||||
# %{_x11fontdir}/Type1/cour*.pfa
|
||||
# %%{_x11fontdir}/Type1/cour*.afm
|
||||
# %%{_x11fontdir}/Type1/cour*.pfa
|
||||
#font-xfree86-type1
|
||||
%{_x11fontdir}/Type1/cursor.pfa
|
||||
%ghost %verify(not md5 size mtime) %{_x11fontdir}/Type1/encodings.dir
|
||||
@ -965,6 +946,8 @@ mkfontdir %{_x11fontdir}/cyrillic
|
||||
- Clean up SPEC file, remove obsolete tags, fix all rpmlint warnings.
|
||||
- Rework build/install section to be like other xorg packages.
|
||||
- Remove all obsolete provides/obsoletes/conflicts.
|
||||
- Simplify build requirements.
|
||||
- Simplify build, it has not changed since 2008.
|
||||
|
||||
* Thu Oct 23 2014 Hans de Goede <hdegoede@redhat.com> - 7.5-11
|
||||
- Update most fonts:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user