Compare commits
No commits in common. "d2b09ff5c8fa264ad355984e105eda2e4786e073" and "c8s" have entirely different histories.
d2b09ff5c8
...
c8s
66
.gitignore
vendored
66
.gitignore
vendored
@ -1,34 +1,32 @@
|
||||
*.tar.bz2
|
||||
*.tar.gz
|
||||
clog
|
||||
encodings-1.0.3.tar.bz2
|
||||
font-adobe-100dpi-1.0.2.tar.bz2
|
||||
font-adobe-75dpi-1.0.2.tar.bz2
|
||||
font-adobe-utopia-100dpi-1.0.3.tar.bz2
|
||||
font-adobe-utopia-75dpi-1.0.3.tar.bz2
|
||||
font-adobe-utopia-type1-1.0.3.tar.bz2
|
||||
font-alias-1.0.3.tar.bz2
|
||||
font-arabic-misc-1.0.2.tar.bz2
|
||||
font-bh-100dpi-1.0.2.tar.bz2
|
||||
font-bh-75dpi-1.0.2.tar.bz2
|
||||
font-bh-lucidatypewriter-100dpi-1.0.2.tar.bz2
|
||||
font-bh-lucidatypewriter-75dpi-1.0.2.tar.bz2
|
||||
font-bitstream-100dpi-1.0.2.tar.bz2
|
||||
font-bitstream-75dpi-1.0.2.tar.bz2
|
||||
font-bitstream-type1-1.0.2.tar.bz2
|
||||
font-cronyx-cyrillic-1.0.2.tar.bz2
|
||||
font-cursor-misc-1.0.2.tar.bz2
|
||||
font-dec-misc-1.0.2.tar.bz2
|
||||
font-isas-misc-1.0.2.tar.bz2
|
||||
font-jis-misc-1.0.2.tar.bz2
|
||||
font-micro-misc-1.0.2.tar.bz2
|
||||
font-misc-cyrillic-1.0.2.tar.bz2
|
||||
font-misc-ethiopic-1.0.2.tar.bz2
|
||||
font-misc-misc-1.1.1.tar.bz2
|
||||
font-mutt-misc-1.0.2.tar.bz2
|
||||
font-schumacher-misc-1.1.1.tar.bz2
|
||||
font-screen-cyrillic-1.0.3.tar.bz2
|
||||
font-sony-misc-1.0.2.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
|
||||
/encodings-1.0.4.tar.bz2
|
||||
/font-adobe-100dpi-1.0.3.tar.bz2
|
||||
/font-adobe-75dpi-1.0.3.tar.bz2
|
||||
/font-adobe-utopia-100dpi-1.0.4.tar.bz2
|
||||
/font-adobe-utopia-75dpi-1.0.4.tar.bz2
|
||||
/font-adobe-utopia-type1-1.0.4.tar.bz2
|
||||
/font-alias-1.0.3.tar.bz2
|
||||
/font-arabic-misc-1.0.3.tar.bz2
|
||||
/font-bh-100dpi-1.0.3.tar.bz2
|
||||
/font-bh-75dpi-1.0.3.tar.bz2
|
||||
/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2
|
||||
/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2
|
||||
/font-bitstream-100dpi-1.0.3.tar.bz2
|
||||
/font-bitstream-75dpi-1.0.3.tar.bz2
|
||||
/font-bitstream-type1-1.0.3.tar.bz2
|
||||
/font-cronyx-cyrillic-1.0.3.tar.bz2
|
||||
/font-cursor-misc-1.0.3.tar.bz2
|
||||
/font-daewoo-misc-1.0.3.tar.bz2
|
||||
/font-dec-misc-1.0.3.tar.bz2
|
||||
/font-isas-misc-1.0.3.tar.bz2
|
||||
/font-jis-misc-1.0.3.tar.bz2
|
||||
/font-micro-misc-1.0.3.tar.bz2
|
||||
/font-misc-cyrillic-1.0.3.tar.bz2
|
||||
/font-misc-ethiopic-1.0.3.tar.bz2
|
||||
/font-misc-misc-1.1.2.tar.bz2
|
||||
/font-mutt-misc-1.0.3.tar.bz2
|
||||
/font-schumacher-misc-1.1.2.tar.bz2
|
||||
/font-screen-cyrillic-1.0.4.tar.bz2
|
||||
/font-sony-misc-1.0.3.tar.bz2
|
||||
/font-sun-misc-1.0.3.tar.bz2
|
||||
/font-winitzki-cyrillic-1.0.3.tar.bz2
|
||||
/font-xfree86-type1-1.0.4.tar.bz2
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
7ffec76dba1cfd5040c5b43ccfae930c83ddf92e encodings-1.0.5.tar.bz2
|
||||
53311cbd604f18bd9570727105a4222473d363e3 font-adobe-100dpi-1.0.3.tar.bz2
|
||||
6a2ec569336b5646682a14eee3c7790274beffd1 font-adobe-75dpi-1.0.3.tar.bz2
|
||||
9e80cf5bbd5522a5cfad2a9f8f8fce86de0f0226 font-adobe-utopia-100dpi-1.0.4.tar.bz2
|
||||
50e837322a09f1a7c40fb78fc6aad1a157284507 font-adobe-utopia-75dpi-1.0.4.tar.bz2
|
||||
3113cfafb91c2c53df6a1fae57dca6c50fb8ce20 font-adobe-utopia-type1-1.0.4.tar.bz2
|
||||
96b0aa38f88a54ef32ab85d3eef6f29b0437f70d font-alias-1.0.3.tar.bz2
|
||||
322ae41e74deea8de11fa077fd0e0191927a667c font-arabic-misc-1.0.3.tar.bz2
|
||||
47d5e50be9e78695017650a088da52bfcf1eeb40 font-bh-100dpi-1.0.3.tar.bz2
|
||||
7290567d42a0f5adb6a3ad170524bb7ed59871d7 font-bh-75dpi-1.0.3.tar.bz2
|
||||
bc4f804e49db8c6add04f52ffb1c0cd63e714b2c font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2
|
||||
3c6678e6bbb2bd352baaf610a8f6aac9c5140c85 font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2
|
||||
138376f8683c09b9068c7c124842a7af9f0fcc2e font-bitstream-100dpi-1.0.3.tar.bz2
|
||||
975e9f7872483394ebd87610f8bbc924d99bea34 font-bitstream-75dpi-1.0.3.tar.bz2
|
||||
7633551be3525c501278e81259b22ad9a893de4d font-bitstream-type1-1.0.3.tar.bz2
|
||||
e5af8c2e8fb23955808a08bd38728ab3ad284d61 font-cronyx-cyrillic-1.0.3.tar.bz2
|
||||
1649271129bbeff3aeee70a9da87a8e5e59162c1 font-cursor-misc-1.0.3.tar.bz2
|
||||
a748d35b8b0241abd3e1d85f80da318b529a74d0 font-dec-misc-1.0.3.tar.bz2
|
||||
cbd9bf441b25362123c817b1aa7a7be1ee4a9321 font-isas-misc-1.0.3.tar.bz2
|
||||
8c08c5fe01d4605f2886822cb3655548a6535e58 font-jis-misc-1.0.3.tar.bz2
|
||||
db3e912d41bda20f60b520c19e65bd7134ee1224 font-micro-misc-1.0.3.tar.bz2
|
||||
9c0e283ae59e7b05c0798fe0645cc822d22dcb0c font-misc-cyrillic-1.0.3.tar.bz2
|
||||
3f6af53047cb1206d737e8e8fbbbbb315c5419bb font-misc-ethiopic-1.0.3.tar.bz2
|
||||
c6d28c56880807963175cbbd682fb6f75a35f77d font-misc-misc-1.1.2.tar.bz2
|
||||
245d3041d9138b7e4a00858228adad2de304043b font-mutt-misc-1.0.3.tar.bz2
|
||||
fbe3629e9dcc03d12300d4ebab64fd038ea98952 font-schumacher-misc-1.1.2.tar.bz2
|
||||
de1f0226f74d7e4d3ee9ab0b9c87478ab2a7db30 font-screen-cyrillic-1.0.4.tar.bz2
|
||||
8d0dd87148283c8ac8c5ac37906b12fab5ddb1d8 font-sony-misc-1.0.3.tar.bz2
|
||||
6a72602557bb5dfe46c1ee3b56658aeed1e04f9d font-sun-misc-1.0.3.tar.bz2
|
||||
29249b49eac7e3f32d7a1a93808fcfd9d399011c font-winitzki-cyrillic-1.0.3.tar.bz2
|
||||
1381f274a178cbd08627560e17a4a8f6653be3f7 font-xfree86-type1-1.0.4.tar.bz2
|
||||
@ -1,6 +1,6 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-9
|
||||
- rhel-8
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
||||
|
||||
3
sources
3
sources
@ -1,4 +1,4 @@
|
||||
SHA512 (encodings-1.0.5.tar.bz2) = 920e49f0b3545f181a1574ca3280ac9adef1e68fe27566c195dd7013f728d355c0d759132789357fcf8fa7391fcbe1e17edf2bd85aa5611df5a4d99740011008
|
||||
SHA512 (encodings-1.0.4.tar.bz2) = 838d1c9489e9880bf1982dc14d34a48b624b7bc2c0fffbf28e2c24e1546b0602357ca31afef100053481d6a18e357085ef74ac7a82261daa1ac1398bc1e05d17
|
||||
SHA512 (font-adobe-100dpi-1.0.3.tar.bz2) = 27ed98dcdbb9c174c7090cdd8fe230f7471d10b5dfc63e092640b5d0fc6ab351bc8ffa9a92bec1755f2780b3d9c1de3ad298c64b70a68b5e6879a8592ef32987
|
||||
SHA512 (font-adobe-75dpi-1.0.3.tar.bz2) = c0d851df5732e81027e265370751a606c6e4f5eea546d802608988dde02de35fa28238f709f48567191090bf18814f671b1a7f9f0b528d54949b0aa9403f266d
|
||||
SHA512 (font-adobe-utopia-100dpi-1.0.4.tar.bz2) = fecb9a9bde99a82787d12779ea579c8696dcce168acd74b478a879ae24d421d5978d5f69da651e8ff3b25dca355960aaa19f69f2bf61e540464887e546a7b94b
|
||||
@ -15,6 +15,7 @@ SHA512 (font-bitstream-75dpi-1.0.3.tar.bz2) = 9311a5b0cbe1613aca87fdf7fd9ab263eb
|
||||
SHA512 (font-bitstream-type1-1.0.3.tar.bz2) = 71883f7fc0a68b4fb8ef30b8b8bdfd73ae1194b6d6495abde6c819eef7a91d6365ef1b4cae026d6c3fa7fddecc643b46b7ba1232cec404fcada49a92aaf1af61
|
||||
SHA512 (font-cronyx-cyrillic-1.0.3.tar.bz2) = b926c425644f94548ad831c38573009ae97d207a05c9d8a917018c2518911960280eb3861ae11d99bc8d001fb0dca1967712fb70ba4f413bc9d6ac8ef904b456
|
||||
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-isas-misc-1.0.3.tar.bz2) = be6fb1d2c53550a462d1ab010fa7ac913990e83a22d4580c93b8f1f087aa6caa0e46bc87debca2b13b10e5611bd2fe7f6b4240367fb24f59b37f68ffb0e2586b
|
||||
SHA512 (font-jis-misc-1.0.3.tar.bz2) = 3ce4c96d54440045e84f54f7d790e350c05b0c56a72491941f2cd9ed7e2d1735ff4b41667501cf08d5d81ee19c9de6d43f88a8b59a3c5c55de9fb1696cae208c
|
||||
|
||||
@ -1,76 +1,48 @@
|
||||
%global _catalogue /etc/X11/fontpath.d
|
||||
# NOTE: Fonts strictly intended for X core fonts, should be installed into _x11fontdir.
|
||||
%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
|
||||
Name: xorg-x11-fonts
|
||||
Version: 7.5
|
||||
Release: 33%{?dist}
|
||||
Release: 19%{?dist}
|
||||
License: MIT and Lucida and Public Domain
|
||||
URL: https://www.x.org
|
||||
URL: http://www.x.org
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
Source0: https://www.x.org/pub/individual/font/encodings-1.0.5.tar.bz2
|
||||
Source1: https://www.x.org/pub/individual/font/font-adobe-100dpi-1.0.3.tar.bz2
|
||||
Source2: https://www.x.org/pub/individual/font/font-adobe-75dpi-1.0.3.tar.bz2
|
||||
Source3: https://www.x.org/pub/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2
|
||||
Source4: https://www.x.org/pub/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2
|
||||
Source5: https://www.x.org/pub/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2
|
||||
Source6: https://www.x.org/pub/individual/font/font-alias-1.0.3.tar.bz2
|
||||
Source7: https://www.x.org/pub/individual/font/font-arabic-misc-1.0.3.tar.bz2
|
||||
Source8: https://www.x.org/pub/individual/font/font-bh-100dpi-1.0.3.tar.bz2
|
||||
Source9: https://www.x.org/pub/individual/font/font-bh-75dpi-1.0.3.tar.bz2
|
||||
Source10: https://www.x.org/pub/individual/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2
|
||||
Source11: https://www.x.org/pub/individual/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2
|
||||
Source12: https://www.x.org/pub/individual/font/font-bitstream-100dpi-1.0.3.tar.bz2
|
||||
Source13: https://www.x.org/pub/individual/font/font-bitstream-75dpi-1.0.3.tar.bz2
|
||||
Source14: https://www.x.org/pub/individual/font/font-bitstream-type1-1.0.3.tar.bz2
|
||||
Source15: https://www.x.org/pub/individual/font/font-cronyx-cyrillic-1.0.3.tar.bz2
|
||||
Source16: https://www.x.org/pub/individual/font/font-cursor-misc-1.0.3.tar.bz2
|
||||
# Daewoo-misc has no license terms, just Copyright (#1952723)
|
||||
# Source17: https://www.x.org/pub/individual/font/font-daewoo-misc-1.0.3.tar.bz2
|
||||
Source18: https://www.x.org/pub/individual/font/font-dec-misc-1.0.3.tar.bz2
|
||||
Source19: https://www.x.org/pub/individual/font/font-isas-misc-1.0.3.tar.bz2
|
||||
Source20: https://www.x.org/pub/individual/font/font-jis-misc-1.0.3.tar.bz2
|
||||
Source21: https://www.x.org/pub/individual/font/font-micro-misc-1.0.3.tar.bz2
|
||||
Source22: https://www.x.org/pub/individual/font/font-misc-cyrillic-1.0.3.tar.bz2
|
||||
Source23: https://www.x.org/pub/individual/font/font-misc-ethiopic-1.0.3.tar.bz2
|
||||
Source24: https://www.x.org/pub/individual/font/font-misc-misc-1.1.2.tar.bz2
|
||||
Source25: https://www.x.org/pub/individual/font/font-mutt-misc-1.0.3.tar.bz2
|
||||
Source26: https://www.x.org/pub/individual/font/font-schumacher-misc-1.1.2.tar.bz2
|
||||
Source27: https://www.x.org/pub/individual/font/font-screen-cyrillic-1.0.4.tar.bz2
|
||||
Source28: https://www.x.org/pub/individual/font/font-sony-misc-1.0.3.tar.bz2
|
||||
Source29: https://www.x.org/pub/individual/font/font-sun-misc-1.0.3.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
|
||||
Source0: http://www.x.org/pub/individual/font/encodings-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
|
||||
@ -83,8 +55,9 @@ Source31: https://www.x.org/pub/individual/font/font-xfree86-type1-1.0.4.tar.b
|
||||
# to request for relicensing
|
||||
# http://www.x.org/pub/individual/font/font-misc-meltho-1.0.0.tar.bz2
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: bdftopcf mkfontscale
|
||||
Patch1: 0001-jisx0201.1976-0.enc-Add-undefined-mapping-for-0x7f-0.patch
|
||||
|
||||
BuildRequires: bdftopcf
|
||||
BuildRequires: font-util >= 1.1.0
|
||||
BuildRequires: pkgconfig(xorg-macros) >= 1.3
|
||||
BuildRequires: ucs2any
|
||||
@ -242,7 +215,12 @@ Requires(postun): mkfontdir
|
||||
Contains a set of Cyrillic fonts.
|
||||
|
||||
%prep
|
||||
%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
|
||||
%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
|
||||
|
||||
pushd encodings-*
|
||||
%patch1 -p1
|
||||
popd
|
||||
|
||||
|
||||
%build
|
||||
# Build all apps
|
||||
@ -271,7 +249,7 @@ Contains a set of Cyrillic fonts.
|
||||
%configure --with-fontrootdir=%{_x11fontdir}
|
||||
;;
|
||||
esac
|
||||
%make_build
|
||||
make %{?_smp_mflags}
|
||||
popd
|
||||
done
|
||||
}
|
||||
@ -320,173 +298,182 @@ done
|
||||
done
|
||||
}
|
||||
|
||||
|
||||
# xorg-x11-fonts-update-dirs is provided by xorg-x11-font-utils to deduplicate
|
||||
# stuff run in %%post
|
||||
|
||||
%post misc
|
||||
{
|
||||
# Only run fc-cache in the Type1 dir, gzipped pcf's take forever
|
||||
%font_update_dirs misc || :
|
||||
xorg-x11-fonts-update-dirs --skip-fontscale %{_x11fontdir}/misc
|
||||
}
|
||||
|
||||
%postun misc
|
||||
{
|
||||
# Rebuild fonts.dir when uninstalling package. (exclude the local, CID dirs)
|
||||
if [ "$1" = "0" ]; then
|
||||
%font_update_dirs -u misc || :
|
||||
if [ "$1" = "0" -a -d %{_x11fontdir}/misc ]; then
|
||||
xorg-x11-fonts-update-dirs --skip-fontscale %{_x11fontdir}/misc
|
||||
fi
|
||||
}
|
||||
|
||||
%post Type1
|
||||
{
|
||||
%font_update_dirs -f Type1 || :
|
||||
xorg-x11-fonts-update-dirs %{_x11fontdir}/Type1
|
||||
}
|
||||
|
||||
%postun Type1
|
||||
{
|
||||
if [ "$1" = "0" ]; then
|
||||
%font_update_dirs -u -f Type1 || :
|
||||
FONTDIR=%{_x11fontdir}/Type1
|
||||
if [ "$1" = "0" -a -d $FONTDIR ]; then
|
||||
xorg-x11-fonts-update-dirs $FONTDIR
|
||||
fi
|
||||
}
|
||||
|
||||
%post ethiopic
|
||||
{
|
||||
%font_update_dirs -t TTF || :
|
||||
%font_update_dirs -f OTF || :
|
||||
xorg-x11-fonts-update-dirs --skip-fontscale --need-ttmkfdir %{_x11fontdir}/TTF
|
||||
xorg-x11-fonts-update-dirs %{_x11fontdir}/OTF
|
||||
}
|
||||
|
||||
%postun ethiopic
|
||||
{
|
||||
if [ "$1" = "0" ]; then
|
||||
%font_update_dirs -u -t TTF || :
|
||||
%font_update_dirs -u -f OTF || :
|
||||
FONTDIR=%{_x11fontdir}/TTF
|
||||
if [ "$1" = "0" -a -d $FONTDIR ]; then
|
||||
xorg-x11-fonts-update-dirs --skip-fontscale --need-ttmkfdir $FONTDIR
|
||||
fi
|
||||
FONTDIR=%{_x11fontdir}/OTF
|
||||
if [ "$1" = "0" -a -d $FONTDIR ]; then
|
||||
xorg-x11-fonts-update-dirs $FONTDIR
|
||||
fi
|
||||
}
|
||||
|
||||
%post 75dpi
|
||||
mkfontdir %{_x11fontdir}/75dpi || :
|
||||
mkfontdir %{_x11fontdir}/75dpi
|
||||
|
||||
%post 100dpi
|
||||
mkfontdir %{_x11fontdir}/100dpi || :
|
||||
mkfontdir %{_x11fontdir}/100dpi
|
||||
|
||||
%post ISO8859-1-75dpi
|
||||
mkfontdir %{_x11fontdir}/75dpi || :
|
||||
mkfontdir %{_x11fontdir}/75dpi
|
||||
|
||||
%post ISO8859-1-100dpi
|
||||
mkfontdir %{_x11fontdir}/100dpi || :
|
||||
mkfontdir %{_x11fontdir}/100dpi
|
||||
|
||||
%post ISO8859-2-75dpi
|
||||
mkfontdir %{_x11fontdir}/75dpi || :
|
||||
mkfontdir %{_x11fontdir}/75dpi
|
||||
|
||||
%post ISO8859-2-100dpi
|
||||
mkfontdir %{_x11fontdir}/100dpi || :
|
||||
mkfontdir %{_x11fontdir}/100dpi
|
||||
|
||||
%post ISO8859-9-75dpi
|
||||
mkfontdir %{_x11fontdir}/75dpi || :
|
||||
mkfontdir %{_x11fontdir}/75dpi
|
||||
|
||||
%post ISO8859-9-100dpi
|
||||
mkfontdir %{_x11fontdir}/100dpi || :
|
||||
mkfontdir %{_x11fontdir}/100dpi
|
||||
|
||||
%post ISO8859-14-75dpi
|
||||
mkfontdir %{_x11fontdir}/75dpi || :
|
||||
mkfontdir %{_x11fontdir}/75dpi
|
||||
|
||||
%post ISO8859-14-100dpi
|
||||
mkfontdir %{_x11fontdir}/100dpi || :
|
||||
mkfontdir %{_x11fontdir}/100dpi
|
||||
|
||||
%post ISO8859-15-75dpi
|
||||
mkfontdir %{_x11fontdir}/75dpi || :
|
||||
mkfontdir %{_x11fontdir}/75dpi
|
||||
|
||||
%post ISO8859-15-100dpi
|
||||
mkfontdir %{_x11fontdir}/100dpi || :
|
||||
mkfontdir %{_x11fontdir}/100dpi
|
||||
|
||||
%post cyrillic
|
||||
mkfontdir %{_x11fontdir}/cyrillic || :
|
||||
mkfontdir %{_x11fontdir}/cyrillic
|
||||
|
||||
%postun 75dpi
|
||||
{
|
||||
if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then
|
||||
mkfontdir %{_x11fontdir}/75dpi || :
|
||||
mkfontdir %{_x11fontdir}/75dpi
|
||||
fi
|
||||
}
|
||||
|
||||
%postun 100dpi
|
||||
{
|
||||
if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi ]; then
|
||||
mkfontdir %{_x11fontdir}/100dpi || :
|
||||
mkfontdir %{_x11fontdir}/100dpi
|
||||
fi
|
||||
}
|
||||
|
||||
%postun ISO8859-1-75dpi
|
||||
{
|
||||
if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then
|
||||
mkfontdir %{_x11fontdir}/75dpi || :
|
||||
mkfontdir %{_x11fontdir}/75dpi
|
||||
fi
|
||||
}
|
||||
|
||||
%postun ISO8859-1-100dpi
|
||||
{
|
||||
if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi ]; then
|
||||
mkfontdir %{_x11fontdir}/100dpi || :
|
||||
mkfontdir %{_x11fontdir}/100dpi
|
||||
fi
|
||||
}
|
||||
|
||||
%postun ISO8859-2-75dpi
|
||||
{
|
||||
if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then
|
||||
mkfontdir %{_x11fontdir}/75dpi || :
|
||||
mkfontdir %{_x11fontdir}/75dpi
|
||||
fi
|
||||
}
|
||||
|
||||
%postun ISO8859-2-100dpi
|
||||
{
|
||||
if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi ]; then
|
||||
mkfontdir %{_x11fontdir}/100dpi || :
|
||||
mkfontdir %{_x11fontdir}/100dpi
|
||||
fi
|
||||
}
|
||||
|
||||
%postun ISO8859-9-75dpi
|
||||
{
|
||||
if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then
|
||||
mkfontdir %{_x11fontdir}/75dpi || :
|
||||
mkfontdir %{_x11fontdir}/75dpi
|
||||
fi
|
||||
}
|
||||
|
||||
%postun ISO8859-9-100dpi
|
||||
{
|
||||
if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi ]; then
|
||||
mkfontdir %{_x11fontdir}/100dpi || :
|
||||
mkfontdir %{_x11fontdir}/100dpi
|
||||
fi
|
||||
}
|
||||
|
||||
%postun ISO8859-14-75dpi
|
||||
{
|
||||
if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then
|
||||
mkfontdir %{_x11fontdir}/75dpi || :
|
||||
mkfontdir %{_x11fontdir}/75dpi
|
||||
fi
|
||||
}
|
||||
|
||||
%postun ISO8859-14-100dpi
|
||||
{
|
||||
if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi ]; then
|
||||
mkfontdir %{_x11fontdir}/100dpi || :
|
||||
mkfontdir %{_x11fontdir}/100dpi
|
||||
fi
|
||||
}
|
||||
|
||||
%postun ISO8859-15-75dpi
|
||||
{
|
||||
if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then
|
||||
mkfontdir %{_x11fontdir}/75dpi || :
|
||||
mkfontdir %{_x11fontdir}/75dpi
|
||||
fi
|
||||
}
|
||||
|
||||
%postun ISO8859-15-100dpi
|
||||
{
|
||||
if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi ]; then
|
||||
mkfontdir %{_x11fontdir}/100dpi || :
|
||||
mkfontdir %{_x11fontdir}/100dpi
|
||||
fi
|
||||
}
|
||||
|
||||
%postun cyrillic
|
||||
{
|
||||
if [ "$1" = "0" -a -d %{_x11fontdir}/cyrillic ]; then
|
||||
mkfontdir %{_x11fontdir}/cyrillic || :
|
||||
mkfontdir %{_x11fontdir}/cyrillic
|
||||
fi
|
||||
}
|
||||
|
||||
@ -950,55 +937,6 @@ mkfontdir %{_x11fontdir}/cyrillic || :
|
||||
%ghost %verify(not md5 size mtime) %{_x11fontdir}/cyrillic/fonts.cache-*
|
||||
|
||||
%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
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user