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

Compare commits

merge into: rpms:c8s
Branches Tags
rpms:c8s
rpms:c10s
rpms:a10s
rpms:c9
rpms:c9-beta
rpms:c8-beta
rpms:c8
rpms:c9s
rpms:imports/c10s/xorg-x11-fonts-7.5-40.el10
rpms:changed/a10s/xorg-x11-fonts-7.5-39.el10
rpms:imports/c10s/xorg-x11-fonts-7.5-39.el10
rpms:imports/c9/xorg-x11-fonts-7.5-33.el9
rpms:imports/c9-beta/xorg-x11-fonts-7.5-33.el9
rpms:imports/c8-beta/xorg-x11-fonts-7.5-19.el8
rpms:imports/c8/xorg-x11-fonts-7.5-19.el8
rpms:imports/c8s/xorg-x11-fonts-7.5-19.el8
...
pull from: rpms:c9s
Branches Tags
rpms:c10s
rpms:a10s
rpms:c8s
rpms:c9
rpms:c9-beta
rpms:c8-beta
rpms:c8
rpms:c9s
rpms:imports/c10s/xorg-x11-fonts-7.5-40.el10
rpms:changed/a10s/xorg-x11-fonts-7.5-39.el10
rpms:imports/c10s/xorg-x11-fonts-7.5-39.el10
rpms:imports/c9/xorg-x11-fonts-7.5-33.el9
rpms:imports/c9-beta/xorg-x11-fonts-7.5-33.el9
rpms:imports/c8-beta/xorg-x11-fonts-7.5-19.el8
rpms:imports/c8/xorg-x11-fonts-7.5-19.el8
rpms:imports/c8s/xorg-x11-fonts-7.5-19.el8

No commits in common. "c8s" and "c9s" have entirely different histories.
c8s ... c9s

4 changed files with 190 additions and 127 deletions
Show Stats Expand all files Collapse all files

66
.gitignore vendored
View File

@ -1,32 +1,34 @@
/encodings-1.0.4.tar.bz2 *.tar.bz2
/font-adobe-100dpi-1.0.3.tar.bz2 *.tar.gz
/font-adobe-75dpi-1.0.3.tar.bz2 clog
/font-adobe-utopia-100dpi-1.0.4.tar.bz2 encodings-1.0.3.tar.bz2
/font-adobe-utopia-75dpi-1.0.4.tar.bz2 font-adobe-100dpi-1.0.2.tar.bz2
/font-adobe-utopia-type1-1.0.4.tar.bz2 font-adobe-75dpi-1.0.2.tar.bz2
/font-alias-1.0.3.tar.bz2 font-adobe-utopia-100dpi-1.0.3.tar.bz2
/font-arabic-misc-1.0.3.tar.bz2 font-adobe-utopia-75dpi-1.0.3.tar.bz2
/font-bh-100dpi-1.0.3.tar.bz2 font-adobe-utopia-type1-1.0.3.tar.bz2
/font-bh-75dpi-1.0.3.tar.bz2 font-alias-1.0.3.tar.bz2
/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2 font-arabic-misc-1.0.2.tar.bz2
/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2 font-bh-100dpi-1.0.2.tar.bz2
/font-bitstream-100dpi-1.0.3.tar.bz2 font-bh-75dpi-1.0.2.tar.bz2
/font-bitstream-75dpi-1.0.3.tar.bz2 font-bh-lucidatypewriter-100dpi-1.0.2.tar.bz2
/font-bitstream-type1-1.0.3.tar.bz2 font-bh-lucidatypewriter-75dpi-1.0.2.tar.bz2
/font-cronyx-cyrillic-1.0.3.tar.bz2 font-bitstream-100dpi-1.0.2.tar.bz2
/font-cursor-misc-1.0.3.tar.bz2 font-bitstream-75dpi-1.0.2.tar.bz2
/font-daewoo-misc-1.0.3.tar.bz2 font-bitstream-type1-1.0.2.tar.bz2
/font-dec-misc-1.0.3.tar.bz2 font-cronyx-cyrillic-1.0.2.tar.bz2
/font-isas-misc-1.0.3.tar.bz2 font-cursor-misc-1.0.2.tar.bz2
/font-jis-misc-1.0.3.tar.bz2 font-dec-misc-1.0.2.tar.bz2
/font-micro-misc-1.0.3.tar.bz2 font-isas-misc-1.0.2.tar.bz2
/font-misc-cyrillic-1.0.3.tar.bz2 font-jis-misc-1.0.2.tar.bz2
/font-misc-ethiopic-1.0.3.tar.bz2 font-micro-misc-1.0.2.tar.bz2
/font-misc-misc-1.1.2.tar.bz2 font-misc-cyrillic-1.0.2.tar.bz2
/font-mutt-misc-1.0.3.tar.bz2 font-misc-ethiopic-1.0.2.tar.bz2
/font-schumacher-misc-1.1.2.tar.bz2 font-misc-misc-1.1.1.tar.bz2
/font-screen-cyrillic-1.0.4.tar.bz2 font-mutt-misc-1.0.2.tar.bz2
/font-sony-misc-1.0.3.tar.bz2 font-schumacher-misc-1.1.1.tar.bz2
/font-sun-misc-1.0.3.tar.bz2 font-screen-cyrillic-1.0.3.tar.bz2
/font-winitzki-cyrillic-1.0.3.tar.bz2 font-sony-misc-1.0.2.tar.bz2
/font-xfree86-type1-1.0.4.tar.bz2 font-sun-misc-1.0.2.tar.bz2
font-winitzki-cyrillic-1.0.2.tar.bz2
font-xfree86-type1-1.0.3.tar.bz2

2
gating.yaml
View File

@ -1,6 +1,6 @@
--- !Policy --- !Policy
product_versions: product_versions:
- rhel-8 - rhel-9
decision_context: osci_compose_gate decision_context: osci_compose_gate
rules: rules:
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional} - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

3
sources
View File

@ -1,4 +1,4 @@
SHA512 (encodings-1.0.4.tar.bz2) = 838d1c9489e9880bf1982dc14d34a48b624b7bc2c0fffbf28e2c24e1546b0602357ca31afef100053481d6a18e357085ef74ac7a82261daa1ac1398bc1e05d17 SHA512 (encodings-1.0.5.tar.bz2) = 920e49f0b3545f181a1574ca3280ac9adef1e68fe27566c195dd7013f728d355c0d759132789357fcf8fa7391fcbe1e17edf2bd85aa5611df5a4d99740011008
SHA512 (font-adobe-100dpi-1.0.3.tar.bz2) = 27ed98dcdbb9c174c7090cdd8fe230f7471d10b5dfc63e092640b5d0fc6ab351bc8ffa9a92bec1755f2780b3d9c1de3ad298c64b70a68b5e6879a8592ef32987 SHA512 (font-adobe-100dpi-1.0.3.tar.bz2) = 27ed98dcdbb9c174c7090cdd8fe230f7471d10b5dfc63e092640b5d0fc6ab351bc8ffa9a92bec1755f2780b3d9c1de3ad298c64b70a68b5e6879a8592ef32987
SHA512 (font-adobe-75dpi-1.0.3.tar.bz2) = c0d851df5732e81027e265370751a606c6e4f5eea546d802608988dde02de35fa28238f709f48567191090bf18814f671b1a7f9f0b528d54949b0aa9403f266d SHA512 (font-adobe-75dpi-1.0.3.tar.bz2) = c0d851df5732e81027e265370751a606c6e4f5eea546d802608988dde02de35fa28238f709f48567191090bf18814f671b1a7f9f0b528d54949b0aa9403f266d
SHA512 (font-adobe-utopia-100dpi-1.0.4.tar.bz2) = fecb9a9bde99a82787d12779ea579c8696dcce168acd74b478a879ae24d421d5978d5f69da651e8ff3b25dca355960aaa19f69f2bf61e540464887e546a7b94b SHA512 (font-adobe-utopia-100dpi-1.0.4.tar.bz2) = fecb9a9bde99a82787d12779ea579c8696dcce168acd74b478a879ae24d421d5978d5f69da651e8ff3b25dca355960aaa19f69f2bf61e540464887e546a7b94b
@ -15,7 +15,6 @@ SHA512 (font-bitstream-75dpi-1.0.3.tar.bz2) = 9311a5b0cbe1613aca87fdf7fd9ab263eb
SHA512 (font-bitstream-type1-1.0.3.tar.bz2) = 71883f7fc0a68b4fb8ef30b8b8bdfd73ae1194b6d6495abde6c819eef7a91d6365ef1b4cae026d6c3fa7fddecc643b46b7ba1232cec404fcada49a92aaf1af61 SHA512 (font-bitstream-type1-1.0.3.tar.bz2) = 71883f7fc0a68b4fb8ef30b8b8bdfd73ae1194b6d6495abde6c819eef7a91d6365ef1b4cae026d6c3fa7fddecc643b46b7ba1232cec404fcada49a92aaf1af61
SHA512 (font-cronyx-cyrillic-1.0.3.tar.bz2) = b926c425644f94548ad831c38573009ae97d207a05c9d8a917018c2518911960280eb3861ae11d99bc8d001fb0dca1967712fb70ba4f413bc9d6ac8ef904b456 SHA512 (font-cronyx-cyrillic-1.0.3.tar.bz2) = b926c425644f94548ad831c38573009ae97d207a05c9d8a917018c2518911960280eb3861ae11d99bc8d001fb0dca1967712fb70ba4f413bc9d6ac8ef904b456
SHA512 (font-cursor-misc-1.0.3.tar.bz2) = 7ecb7f1c3c11da8b81fc0ff121fa6c1026b11f6c7878ffd0e4959df036511bc579d6b0552422ce13e26a8d188e3406631d2de55cab6b29bc7fce0416a8cffc83 SHA512 (font-cursor-misc-1.0.3.tar.bz2) = 7ecb7f1c3c11da8b81fc0ff121fa6c1026b11f6c7878ffd0e4959df036511bc579d6b0552422ce13e26a8d188e3406631d2de55cab6b29bc7fce0416a8cffc83
SHA512 (font-daewoo-misc-1.0.3.tar.bz2) = 7e97bc580f66a1316e366617d34e1dbefd576b47b9373ef34833aaaf2fdefc50befc2add5f038915db0b45fbdd56b77304a8a980bb72726479d429085c406f06
SHA512 (font-dec-misc-1.0.3.tar.bz2) = af755d51c4c59cdbe5d3dccf37990bc787373958feb984bb037c8d8aba8a0eb410965a3600886b5123d89e85e1ea0498b84dfa384fccbbcbcaf3549b83c839c6 SHA512 (font-dec-misc-1.0.3.tar.bz2) = af755d51c4c59cdbe5d3dccf37990bc787373958feb984bb037c8d8aba8a0eb410965a3600886b5123d89e85e1ea0498b84dfa384fccbbcbcaf3549b83c839c6
SHA512 (font-isas-misc-1.0.3.tar.bz2) = be6fb1d2c53550a462d1ab010fa7ac913990e83a22d4580c93b8f1f087aa6caa0e46bc87debca2b13b10e5611bd2fe7f6b4240367fb24f59b37f68ffb0e2586b SHA512 (font-isas-misc-1.0.3.tar.bz2) = be6fb1d2c53550a462d1ab010fa7ac913990e83a22d4580c93b8f1f087aa6caa0e46bc87debca2b13b10e5611bd2fe7f6b4240367fb24f59b37f68ffb0e2586b
SHA512 (font-jis-misc-1.0.3.tar.bz2) = 3ce4c96d54440045e84f54f7d790e350c05b0c56a72491941f2cd9ed7e2d1735ff4b41667501cf08d5d81ee19c9de6d43f88a8b59a3c5c55de9fb1696cae208c SHA512 (font-jis-misc-1.0.3.tar.bz2) = 3ce4c96d54440045e84f54f7d790e350c05b0c56a72491941f2cd9ed7e2d1735ff4b41667501cf08d5d81ee19c9de6d43f88a8b59a3c5c55de9fb1696cae208c

246
xorg-x11-fonts.spec
View File

@ -1,48 +1,76 @@
%global _catalogue /etc/X11/fontpath.d %global _catalogue /etc/X11/fontpath.d
# NOTE: Fonts strictly intended for X core fonts, should be installed into _x11fontdir. # NOTE: Fonts strictly intended for X core fonts, should be installed into _x11fontdir.
%global _x11fontdir %{_datadir}/X11/fonts %global _x11fontdir %{_datadir}/X11/fonts
%global _x11fontencodingsdir %{_x11fontdir}/encodings
# A macro to de-duplicate a set of calls used in multiple fonts.
# Usage: font_update_dirs [-f] [-t] <directory>
# -f ... run fontscale
# -t ... run ttmkfdir
# -u ... uninstall mode, only perform actions if the target directory exists
# <directory>
%global font_update_dirs(ftu) ( \
if [ -z "%*" ]; then \
echo "Missing directory argument"; \
exit 1; \
fi \
fontdir="%{_x11fontdir}/%%1" \
if [ -z "%%{-u}" -o -d $fontdir ]; then \
if [ ! -z "%%{-f}" ]; then \
mkfontscale "$fontdir"; \
fi \
if [ ! -z "%%{-t}" ]; then \
ttmkfdir -d "$fontdir" -o "$fontdir/fonts.scale"; \
fi \
mkfontdir "$fontdir"; \
fc-cache "$fontdir"; \
mkdir -p "%{_x11fontencodingsdir}/large"; \
mkfontscale -n -e "%{_x11fontencodingsdir}" -e "%{_x11fontencodingsdir}/large" "%{_x11fontencodingsdir}"; \
fi \
)
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: 19%{?dist} Release: 33%{?dist}
License: MIT and Lucida and Public Domain License: MIT and Lucida and Public Domain
URL: http://www.x.org URL: https://www.x.org
BuildArch: noarch BuildArch: noarch
Source0: http://www.x.org/pub/individual/font/encodings-1.0.4.tar.bz2 Source0: https://www.x.org/pub/individual/font/encodings-1.0.5.tar.bz2
Source1: http://www.x.org/pub/individual/font/font-adobe-100dpi-1.0.3.tar.bz2 Source1: https://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 Source2: https://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 Source3: https://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 Source4: https://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 Source5: https://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 Source6: https://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 Source7: https://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 Source8: https://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 Source9: https://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 Source10: https://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 Source11: https://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 Source12: https://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 Source13: https://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 Source14: https://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 Source15: https://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 Source16: https://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 # Daewoo-misc has no license terms, just Copyright (#1952723)
Source18: http://www.x.org/pub/individual/font/font-dec-misc-1.0.3.tar.bz2 # Source17: https://www.x.org/pub/individual/font/font-daewoo-misc-1.0.3.tar.bz2
Source19: http://www.x.org/pub/individual/font/font-isas-misc-1.0.3.tar.bz2 Source18: https://www.x.org/pub/individual/font/font-dec-misc-1.0.3.tar.bz2
Source20: http://www.x.org/pub/individual/font/font-jis-misc-1.0.3.tar.bz2 Source19: https://www.x.org/pub/individual/font/font-isas-misc-1.0.3.tar.bz2
Source21: http://www.x.org/pub/individual/font/font-micro-misc-1.0.3.tar.bz2 Source20: https://www.x.org/pub/individual/font/font-jis-misc-1.0.3.tar.bz2
Source22: http://www.x.org/pub/individual/font/font-misc-cyrillic-1.0.3.tar.bz2 Source21: https://www.x.org/pub/individual/font/font-micro-misc-1.0.3.tar.bz2
Source23: http://www.x.org/pub/individual/font/font-misc-ethiopic-1.0.3.tar.bz2 Source22: https://www.x.org/pub/individual/font/font-misc-cyrillic-1.0.3.tar.bz2
Source24: http://www.x.org/pub/individual/font/font-misc-misc-1.1.2.tar.bz2 Source23: https://www.x.org/pub/individual/font/font-misc-ethiopic-1.0.3.tar.bz2
Source25: http://www.x.org/pub/individual/font/font-mutt-misc-1.0.3.tar.bz2 Source24: https://www.x.org/pub/individual/font/font-misc-misc-1.1.2.tar.bz2
Source26: http://www.x.org/pub/individual/font/font-schumacher-misc-1.1.2.tar.bz2 Source25: https://www.x.org/pub/individual/font/font-mutt-misc-1.0.3.tar.bz2
Source27: http://www.x.org/pub/individual/font/font-screen-cyrillic-1.0.4.tar.bz2 Source26: https://www.x.org/pub/individual/font/font-schumacher-misc-1.1.2.tar.bz2
Source28: http://www.x.org/pub/individual/font/font-sony-misc-1.0.3.tar.bz2 Source27: https://www.x.org/pub/individual/font/font-screen-cyrillic-1.0.4.tar.bz2
Source29: http://www.x.org/pub/individual/font/font-sun-misc-1.0.3.tar.bz2 Source28: https://www.x.org/pub/individual/font/font-sony-misc-1.0.3.tar.bz2
Source30: http://www.x.org/pub/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2 Source29: https://www.x.org/pub/individual/font/font-sun-misc-1.0.3.tar.bz2
Source31: http://www.x.org/pub/individual/font/font-xfree86-type1-1.0.4.tar.bz2 Source30: https://www.x.org/pub/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2
Source31: https://www.x.org/pub/individual/font/font-xfree86-type1-1.0.4.tar.bz2
# Luxi fonts are under a bad license # 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-ttf-1.0.0.tar.bz2
@ -55,9 +83,8 @@ Source31: http://www.x.org/pub/individual/font/font-xfree86-type1-1.0.4.tar.bz
# to request for relicensing # to request for relicensing
# http://www.x.org/pub/individual/font/font-misc-meltho-1.0.0.tar.bz2 # 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: make
BuildRequires: bdftopcf mkfontscale
BuildRequires: bdftopcf
BuildRequires: font-util >= 1.1.0 BuildRequires: font-util >= 1.1.0
BuildRequires: pkgconfig(xorg-macros) >= 1.3 BuildRequires: pkgconfig(xorg-macros) >= 1.3
BuildRequires: ucs2any BuildRequires: ucs2any
@ -215,12 +242,7 @@ Requires(postun): mkfontdir
Contains a set of Cyrillic fonts. Contains a set of Cyrillic fonts.
%prep %prep
%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} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30 -a31
pushd encodings-*
%patch1 -p1
popd
%build %build
# Build all apps # Build all apps
@ -249,7 +271,7 @@ popd
%configure --with-fontrootdir=%{_x11fontdir} %configure --with-fontrootdir=%{_x11fontdir}
;; ;;
esac esac
make %{?_smp_mflags} %make_build
popd popd
done done
} }
@ -298,182 +320,173 @@ done
done done
} }
# xorg-x11-fonts-update-dirs is provided by xorg-x11-font-utils to deduplicate
# stuff run in %%post
%post misc %post misc
{ {
# Only run fc-cache in the Type1 dir, gzipped pcf's take forever # Only run fc-cache in the Type1 dir, gzipped pcf's take forever
xorg-x11-fonts-update-dirs --skip-fontscale %{_x11fontdir}/misc %font_update_dirs misc || :
} }
%postun misc %postun misc
{ {
# Rebuild fonts.dir when uninstalling package. (exclude the local, CID dirs) # Rebuild fonts.dir when uninstalling package. (exclude the local, CID dirs)
if [ "$1" = "0" -a -d %{_x11fontdir}/misc ]; then if [ "$1" = "0" ]; then
xorg-x11-fonts-update-dirs --skip-fontscale %{_x11fontdir}/misc %font_update_dirs -u misc || :
fi fi
} }
%post Type1 %post Type1
{ {
xorg-x11-fonts-update-dirs %{_x11fontdir}/Type1 %font_update_dirs -f Type1 || :
} }
%postun Type1 %postun Type1
{ {
FONTDIR=%{_x11fontdir}/Type1 if [ "$1" = "0" ]; then
if [ "$1" = "0" -a -d $FONTDIR ]; then %font_update_dirs -u -f Type1 || :
xorg-x11-fonts-update-dirs $FONTDIR
fi fi
} }
%post ethiopic %post ethiopic
{ {
xorg-x11-fonts-update-dirs --skip-fontscale --need-ttmkfdir %{_x11fontdir}/TTF %font_update_dirs -t TTF || :
xorg-x11-fonts-update-dirs %{_x11fontdir}/OTF %font_update_dirs -f OTF || :
} }
%postun ethiopic %postun ethiopic
{ {
FONTDIR=%{_x11fontdir}/TTF if [ "$1" = "0" ]; then
if [ "$1" = "0" -a -d $FONTDIR ]; then %font_update_dirs -u -t TTF || :
xorg-x11-fonts-update-dirs --skip-fontscale --need-ttmkfdir $FONTDIR %font_update_dirs -u -f OTF || :
fi
FONTDIR=%{_x11fontdir}/OTF
if [ "$1" = "0" -a -d $FONTDIR ]; then
xorg-x11-fonts-update-dirs $FONTDIR
fi fi
} }
%post 75dpi %post 75dpi
mkfontdir %{_x11fontdir}/75dpi mkfontdir %{_x11fontdir}/75dpi || :
%post 100dpi %post 100dpi
mkfontdir %{_x11fontdir}/100dpi mkfontdir %{_x11fontdir}/100dpi || :
%post ISO8859-1-75dpi %post ISO8859-1-75dpi
mkfontdir %{_x11fontdir}/75dpi mkfontdir %{_x11fontdir}/75dpi || :
%post ISO8859-1-100dpi %post ISO8859-1-100dpi
mkfontdir %{_x11fontdir}/100dpi mkfontdir %{_x11fontdir}/100dpi || :
%post ISO8859-2-75dpi %post ISO8859-2-75dpi
mkfontdir %{_x11fontdir}/75dpi mkfontdir %{_x11fontdir}/75dpi || :
%post ISO8859-2-100dpi %post ISO8859-2-100dpi
mkfontdir %{_x11fontdir}/100dpi mkfontdir %{_x11fontdir}/100dpi || :
%post ISO8859-9-75dpi %post ISO8859-9-75dpi
mkfontdir %{_x11fontdir}/75dpi mkfontdir %{_x11fontdir}/75dpi || :
%post ISO8859-9-100dpi %post ISO8859-9-100dpi
mkfontdir %{_x11fontdir}/100dpi mkfontdir %{_x11fontdir}/100dpi || :
%post ISO8859-14-75dpi %post ISO8859-14-75dpi
mkfontdir %{_x11fontdir}/75dpi mkfontdir %{_x11fontdir}/75dpi || :
%post ISO8859-14-100dpi %post ISO8859-14-100dpi
mkfontdir %{_x11fontdir}/100dpi mkfontdir %{_x11fontdir}/100dpi || :
%post ISO8859-15-75dpi %post ISO8859-15-75dpi
mkfontdir %{_x11fontdir}/75dpi mkfontdir %{_x11fontdir}/75dpi || :
%post ISO8859-15-100dpi %post ISO8859-15-100dpi
mkfontdir %{_x11fontdir}/100dpi mkfontdir %{_x11fontdir}/100dpi || :
%post cyrillic %post cyrillic
mkfontdir %{_x11fontdir}/cyrillic mkfontdir %{_x11fontdir}/cyrillic || :
%postun 75dpi %postun 75dpi
{ {
if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then
mkfontdir %{_x11fontdir}/75dpi mkfontdir %{_x11fontdir}/75dpi || :
fi fi
} }
%postun 100dpi %postun 100dpi
{ {
if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi ]; then if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi ]; then
mkfontdir %{_x11fontdir}/100dpi mkfontdir %{_x11fontdir}/100dpi || :
fi fi
} }
%postun ISO8859-1-75dpi %postun ISO8859-1-75dpi
{ {
if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then
mkfontdir %{_x11fontdir}/75dpi mkfontdir %{_x11fontdir}/75dpi || :
fi fi
} }
%postun ISO8859-1-100dpi %postun ISO8859-1-100dpi
{ {
if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi ]; then if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi ]; then
mkfontdir %{_x11fontdir}/100dpi mkfontdir %{_x11fontdir}/100dpi || :
fi fi
} }
%postun ISO8859-2-75dpi %postun ISO8859-2-75dpi
{ {
if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then
mkfontdir %{_x11fontdir}/75dpi mkfontdir %{_x11fontdir}/75dpi || :
fi fi
} }
%postun ISO8859-2-100dpi %postun ISO8859-2-100dpi
{ {
if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi ]; then if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi ]; then
mkfontdir %{_x11fontdir}/100dpi mkfontdir %{_x11fontdir}/100dpi || :
fi fi
} }
%postun ISO8859-9-75dpi %postun ISO8859-9-75dpi
{ {
if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then
mkfontdir %{_x11fontdir}/75dpi mkfontdir %{_x11fontdir}/75dpi || :
fi fi
} }
%postun ISO8859-9-100dpi %postun ISO8859-9-100dpi
{ {
if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi ]; then if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi ]; then
mkfontdir %{_x11fontdir}/100dpi mkfontdir %{_x11fontdir}/100dpi || :
fi fi
} }
%postun ISO8859-14-75dpi %postun ISO8859-14-75dpi
{ {
if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then
mkfontdir %{_x11fontdir}/75dpi mkfontdir %{_x11fontdir}/75dpi || :
fi fi
} }
%postun ISO8859-14-100dpi %postun ISO8859-14-100dpi
{ {
if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi ]; then if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi ]; then
mkfontdir %{_x11fontdir}/100dpi mkfontdir %{_x11fontdir}/100dpi || :
fi fi
} }
%postun ISO8859-15-75dpi %postun ISO8859-15-75dpi
{ {
if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then
mkfontdir %{_x11fontdir}/75dpi mkfontdir %{_x11fontdir}/75dpi || :
fi fi
} }
%postun ISO8859-15-100dpi %postun ISO8859-15-100dpi
{ {
if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi ]; then if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi ]; then
mkfontdir %{_x11fontdir}/100dpi mkfontdir %{_x11fontdir}/100dpi || :
fi fi
} }
%postun cyrillic %postun cyrillic
{ {
if [ "$1" = "0" -a -d %{_x11fontdir}/cyrillic ]; then if [ "$1" = "0" -a -d %{_x11fontdir}/cyrillic ]; then
mkfontdir %{_x11fontdir}/cyrillic mkfontdir %{_x11fontdir}/cyrillic || :
fi fi
} }
@ -937,6 +950,55 @@ mkfontdir %{_x11fontdir}/cyrillic
%ghost %verify(not md5 size mtime) %{_x11fontdir}/cyrillic/fonts.cache-* %ghost %verify(not md5 size mtime) %{_x11fontdir}/cyrillic/fonts.cache-*
%changelog %changelog
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 7.5-33
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 23 2021 Peter Hutterer <peter.hutterer@redhat.com> 7.5-31
- Drop the daewoo-misc fonts, they have no upstream license terms and may be
proprietary (#1952727)
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 7.5-31
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Fri Mar 12 2021 Peter Hutterer <peter.hutterer@redhat.com> 7.5-30
- Replace the external xorg-x11-fonts-update-dirs script with an rpm macro
doing the same thing, removing our runtime reliance on
xorg-x11-font-utils (#1938074)
* Fri Mar 12 2021 Peter Hutterer <peter.hutterer@redhat.com> 7.5-29
- BuildRequire mkfontscale now that it's separated out from
xorg-x11-font-utils (#1938069)
- Use the make_build rpm macro
* Mon Feb 22 2021 Adam Williamson <awilliam@redhat.com> - 7.5-28
- Make scriptlets non-failable (#1926533)
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.5-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Thu Nov 5 10:26:36 AEST 2020 Peter Hutterer <peter.hutterer@redhat.com> - 7.5-26
- Add BuildRequires for make
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.5-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.5-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.5-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Mon Jun 17 2019 Adam Jackson <ajax@redhat.com> - 7.5-22
- encodings 1.0.5
- Change to HTTPS URLs
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.5-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 7.5-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 7.5-19 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 7.5-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
@ -1037,7 +1099,7 @@ mkfontdir %{_x11fontdir}/cyrillic
* Tue Jun 08 2010 Peter Hutterer <peter.hutterer@redhat.com> 7.2-11 * Tue Jun 08 2010 Peter Hutterer <peter.hutterer@redhat.com> 7.2-11
- Require xorg-x11-font-utils >= 7.2-11 for font-utils 1.1.0 - Require xorg-x11-font-utils >= 7.2-11 for font-utils 1.1.0
- 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