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

Compare commits

base: rpms:imports/c9-beta/xorg-x11-fonts-7.5-33.el9
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
..
compare: rpms:c8s
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. "imports/c9-beta/xorg-x11-fonts-7.5-33.el9" and "c8s" have entirely different histories.
imports/c9 ... c8s

6 changed files with 204 additions and 216 deletions
Show Stats Expand all files Collapse all files

63
.gitignore vendored
View File

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

31
.xorg-x11-fonts.metadata
View File

@ -1,31 +0,0 @@
7ffec76dba1cfd5040c5b43ccfae930c83ddf92e SOURCES/encodings-1.0.5.tar.bz2
53311cbd604f18bd9570727105a4222473d363e3 SOURCES/font-adobe-100dpi-1.0.3.tar.bz2
6a2ec569336b5646682a14eee3c7790274beffd1 SOURCES/font-adobe-75dpi-1.0.3.tar.bz2
9e80cf5bbd5522a5cfad2a9f8f8fce86de0f0226 SOURCES/font-adobe-utopia-100dpi-1.0.4.tar.bz2
50e837322a09f1a7c40fb78fc6aad1a157284507 SOURCES/font-adobe-utopia-75dpi-1.0.4.tar.bz2
3113cfafb91c2c53df6a1fae57dca6c50fb8ce20 SOURCES/font-adobe-utopia-type1-1.0.4.tar.bz2
96b0aa38f88a54ef32ab85d3eef6f29b0437f70d SOURCES/font-alias-1.0.3.tar.bz2
322ae41e74deea8de11fa077fd0e0191927a667c SOURCES/font-arabic-misc-1.0.3.tar.bz2
47d5e50be9e78695017650a088da52bfcf1eeb40 SOURCES/font-bh-100dpi-1.0.3.tar.bz2
7290567d42a0f5adb6a3ad170524bb7ed59871d7 SOURCES/font-bh-75dpi-1.0.3.tar.bz2
bc4f804e49db8c6add04f52ffb1c0cd63e714b2c SOURCES/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2
3c6678e6bbb2bd352baaf610a8f6aac9c5140c85 SOURCES/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2
138376f8683c09b9068c7c124842a7af9f0fcc2e SOURCES/font-bitstream-100dpi-1.0.3.tar.bz2
975e9f7872483394ebd87610f8bbc924d99bea34 SOURCES/font-bitstream-75dpi-1.0.3.tar.bz2
7633551be3525c501278e81259b22ad9a893de4d SOURCES/font-bitstream-type1-1.0.3.tar.bz2
e5af8c2e8fb23955808a08bd38728ab3ad284d61 SOURCES/font-cronyx-cyrillic-1.0.3.tar.bz2
1649271129bbeff3aeee70a9da87a8e5e59162c1 SOURCES/font-cursor-misc-1.0.3.tar.bz2
a748d35b8b0241abd3e1d85f80da318b529a74d0 SOURCES/font-dec-misc-1.0.3.tar.bz2
cbd9bf441b25362123c817b1aa7a7be1ee4a9321 SOURCES/font-isas-misc-1.0.3.tar.bz2
8c08c5fe01d4605f2886822cb3655548a6535e58 SOURCES/font-jis-misc-1.0.3.tar.bz2
db3e912d41bda20f60b520c19e65bd7134ee1224 SOURCES/font-micro-misc-1.0.3.tar.bz2
9c0e283ae59e7b05c0798fe0645cc822d22dcb0c SOURCES/font-misc-cyrillic-1.0.3.tar.bz2
3f6af53047cb1206d737e8e8fbbbbb315c5419bb SOURCES/font-misc-ethiopic-1.0.3.tar.bz2
c6d28c56880807963175cbbd682fb6f75a35f77d SOURCES/font-misc-misc-1.1.2.tar.bz2
245d3041d9138b7e4a00858228adad2de304043b SOURCES/font-mutt-misc-1.0.3.tar.bz2
fbe3629e9dcc03d12300d4ebab64fd038ea98952 SOURCES/font-schumacher-misc-1.1.2.tar.bz2
de1f0226f74d7e4d3ee9ab0b9c87478ab2a7db30 SOURCES/font-screen-cyrillic-1.0.4.tar.bz2
8d0dd87148283c8ac8c5ac37906b12fab5ddb1d8 SOURCES/font-sony-misc-1.0.3.tar.bz2
6a72602557bb5dfe46c1ee3b56658aeed1e04f9d SOURCES/font-sun-misc-1.0.3.tar.bz2
29249b49eac7e3f32d7a1a93808fcfd9d399011c SOURCES/font-winitzki-cyrillic-1.0.3.tar.bz2
1381f274a178cbd08627560e17a4a8f6653be3f7 SOURCES/font-xfree86-type1-1.0.4.tar.bz2

42
0001-jisx0201.1976-0.enc-Add-undefined-mapping-for-0x7f-0.patch Normal file
View File

@ -0,0 +1,42 @@
From 1cc96f25aff9898a93f2a575d9f6c57574da042f Mon Sep 17 00:00:00 2001
From: Akira TAGOH <tagoh@redhat.com>
Date: Thu, 23 Oct 2014 12:57:43 +0200
Subject: [PATCH font/encodings] jisx0201.1976-0.enc: Add undefined mapping for
0x7f - 0xa0 range
The jisx0201 encoding has a hole in it in the 0x7f - 0xa0 range, see:
http://en.wikipedia.org/wiki/JIS_X_0201
The document for the format of the encoding files says:
"Codes not listed are assumed to map through the identity (i.e. to the same
numerical value). In order to override this default mapping, you may specify
a range of codes to be undefined by using an `UNDEFINE' line"
jisx0201.1976-0.enc was not doing this, causing all the codes on the range
to be mapped 1:1. This specifically is causing problems for ttmkfdir, which
checks that a font covers (most of) an encoding before adding a line for that
encoding to fonts.scale, and the hole not properly being undefined causes
this check to fail for atleast the Sazanami fonts.
Cc: Akira TAGOH <tagoh@redhat.com>
BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1009350
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
large/jisx0201.1976-0.enc | 1 +
1 file changed, 1 insertion(+)
diff --git a/large/jisx0201.1976-0.enc b/large/jisx0201.1976-0.enc
index 915d50c..328bc7a 100644
--- a/large/jisx0201.1976-0.enc
+++ b/large/jisx0201.1976-0.enc
@@ -68,6 +68,7 @@ ENDMAPPING
STARTMAPPING unicode
0x5C 0x00A5 # YEN SIGN
0x7E 0x203E # OVERLINE
+UNDEFINE 0x7F 0xA0
0x00A1 0x00DF 0xFF61
ENDMAPPING
STARTMAPPING cmap 1 1
--
2.1.0

6
gating.yaml Normal file
View File

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

32
sources Normal file
View File

@ -0,0 +1,32 @@
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
SHA512 (font-adobe-utopia-75dpi-1.0.4.tar.bz2) = c569af760a62b00738be65546364587638e8c46e4a0765013747e9595d51bc0633908c72359e42e7ebf6240fdc6294b51512c0a096a5fe64b2bd300ccbff7b92
SHA512 (font-adobe-utopia-type1-1.0.4.tar.bz2) = 53ff2ce7b17824a0eed1be6c3e3386e51983389f5623e732ac898c4e08769c8720f6d6b7c75b6455e050ec5dc390376747ca4cdb9f831a218f9dd5ee5edcd0d6
SHA512 (font-alias-1.0.3.tar.bz2) = 05abfef4615722d8cf3f21ab1118494522553a75427140d9753b3d312f404735c20766ceacc1b53f9e783ea25ec8f2f6bdb8696525a4962afe29f524ed8b6552
SHA512 (font-arabic-misc-1.0.3.tar.bz2) = 46a416bf888afdb54f5dda6c9a7207dc069d14089ba14b262c60cb9ad427784c46e2a61b32a79f1d745e73ea657bbc36b48aa5d4bbd79f73a2d997b027ddfbc0
SHA512 (font-bh-100dpi-1.0.3.tar.bz2) = 60532fb3bd25bad08b1db65f96fdd1cdb2ae5fd580729d7851f5b619f1ed6bdef4fec30111ec408cec9ae5e94f92ad9cf214214c01ac684f3a4bd8d43bafd8a2
SHA512 (font-bh-75dpi-1.0.3.tar.bz2) = fb19c7fe91b6cc0670b01d5b8165075866ad08796293650d6037d79211ca668decdcc1b3684774907c06073145919655690d78ccdcf2511db38b5879328a9f50
SHA512 (font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2) = 1862003c20aa7709ea07487a4326c619e2beb33b7069d644f438d64182b41a06039c69e2867921b4d12939612a4b8e1e1727fd15851aeab9a0361060183e3b0f
SHA512 (font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2) = 2bba19c10df8e95f95d59d5fc7c15380c91a5140b0fa490497dbdf78a5574adae06a5566941c8c61e4a9850712fc9ca16974173aeee771f41976f472f0a2de13
SHA512 (font-bitstream-100dpi-1.0.3.tar.bz2) = 10fd920d46d2cb1b314e8c2f05c202e9ffa74a4e5315f34790eba8bd8fcda865a6932eb712a7538624e69367647bcd6891e7015099e65463aeef772d0ba58bfd
SHA512 (font-bitstream-75dpi-1.0.3.tar.bz2) = 9311a5b0cbe1613aca87fdf7fd9ab263eb1129e3c3eacbce54547f2185e151fb1237128b1b6d39f716f28694a486909564ecc9a0aef061438622d11b5661d650
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
SHA512 (font-micro-misc-1.0.3.tar.bz2) = 7a546432225c22ae0aacf9ce88b617a7d1d6678ee1f5eb4b3a93e33764fb752f27bca3feda1312182517bbf7babd5f3700bb9b8de0ef6c35b1ae6e2ce7ab0b69
SHA512 (font-misc-cyrillic-1.0.3.tar.bz2) = 75e49cdb633f7ce5b9612d5adb0a85471c8fde5d55e8ccd9302f79f01e99e78b02449642c2cf785289f58d833bfa62042fce4253093fb17c87471559d1f9bdbf
SHA512 (font-misc-ethiopic-1.0.3.tar.bz2) = b3e3f7462f37216796730a894761c7d60d5ede0f51351997e6c3c92e3136c788a2710690f482d05ed1396a4b6be452e1f871febc7e5b7a1a67e43bcc1ec7c77d
SHA512 (font-misc-misc-1.1.2.tar.bz2) = d0bf74142f9621746846ea7a6fe9ae298a303a09c65e05c7decb4f37b2f513a88d727bf3dc5a3566c30de83b83493f164be0118b41d704464f75700b55018c74
SHA512 (font-mutt-misc-1.0.3.tar.bz2) = 7b152f6c1464d806b1f76664d9b619858c3cb3ea63027b6be1f69897e939e3a0b5312ddf230e0a42a8f3e3701e50f41917cac6ce566c05bc74dfa49bdf2ed4db
SHA512 (font-schumacher-misc-1.1.2.tar.bz2) = f37a2bfce95458b11376c89767b5adaea03dcecd7ed5b99a19a3d263f48e70b15bf679826a794c55da26b5f1635ea5fa5772ffe44c9f77a1daab0744ed92300a
SHA512 (font-screen-cyrillic-1.0.4.tar.bz2) = 58f12a4cbd18e323daad75b32a01ab3980dca0046f8dd94ff4452606ab9316b8a208dda3bc8e9346c02993bd2b8bb2b3dfe3413ccf9fc6a907fc1ea5d236fa51
SHA512 (font-sony-misc-1.0.3.tar.bz2) = c397b4e5081b2946799d701b8c48fca9fd2d55b8fa1dd96d2b29c5cd9996bb7356ae12671bf3bd964e6313bdc154020ed6377534e59ce53067e955e4b37aee1d
SHA512 (font-sun-misc-1.0.3.tar.bz2) = 52c4a38e49a94831999652d9830da841949c319083ea40492e83690e1e5c2d31ea1979046a420af0e51bc105b8697bb06b4a438485e82b130d7469ad4519e275
SHA512 (font-winitzki-cyrillic-1.0.3.tar.bz2) = f98fa99c1b0e60160b362310a7fe5fd5798aaa686751a6784a697c546ed754e885537eeed39a1f973dbceabc962cb65b39af1d336649381a49feb6df9f23e2b7
SHA512 (font-xfree86-type1-1.0.4.tar.bz2) = 2b4afc6cbb7953f8ba4aab7862d16b7b988ea6a4df6de8d41c8340d35a1cd53d6fcc26479ff88189d1de9f42804e4f56d70e9dbd7e75820eab4ac6ae3a96840c

242
SPECS/xorg-x11-fonts.spec → xorg-x11-fonts.spec
View File

@ -1,76 +1,48 @@
%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: 33%{?dist} Release: 19%{?dist}
License: MIT and Lucida and Public Domain License: MIT and Lucida and Public Domain
URL: https://www.x.org URL: http://www.x.org
BuildArch: noarch BuildArch: noarch
Source0: https://www.x.org/pub/individual/font/encodings-1.0.5.tar.bz2 Source0: http://www.x.org/pub/individual/font/encodings-1.0.4.tar.bz2
Source1: https://www.x.org/pub/individual/font/font-adobe-100dpi-1.0.3.tar.bz2 Source1: http://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 Source2: http://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 Source3: http://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 Source4: http://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 Source5: http://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 Source6: http://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 Source7: http://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 Source8: http://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 Source9: http://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 Source10: http://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 Source11: http://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 Source12: http://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 Source13: http://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 Source14: http://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 Source15: http://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 Source16: http://www.x.org/pub/individual/font/font-cursor-misc-1.0.3.tar.bz2
# Daewoo-misc has no license terms, just Copyright (#1952723) Source17: http://www.x.org/pub/individual/font/font-daewoo-misc-1.0.3.tar.bz2
# Source17: https://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
Source18: https://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
Source19: https://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
Source20: https://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
Source21: https://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
Source22: https://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
Source23: https://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
Source24: https://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
Source25: https://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
Source26: https://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
Source27: https://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
Source28: https://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
Source29: https://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
Source30: https://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
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
@ -83,8 +55,9 @@ Source31: https://www.x.org/pub/individual/font/font-xfree86-type1-1.0.4.tar.b
# 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
BuildRequires: make Patch1: 0001-jisx0201.1976-0.enc-Add-undefined-mapping-for-0x7f-0.patch
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
@ -242,7 +215,12 @@ 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 -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
# Build all apps # Build all apps
@ -271,7 +249,7 @@ Contains a set of Cyrillic fonts.
%configure --with-fontrootdir=%{_x11fontdir} %configure --with-fontrootdir=%{_x11fontdir}
;; ;;
esac esac
%make_build make %{?_smp_mflags}
popd popd
done done
} }
@ -320,173 +298,182 @@ 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
%font_update_dirs misc || : xorg-x11-fonts-update-dirs --skip-fontscale %{_x11fontdir}/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" ]; then if [ "$1" = "0" -a -d %{_x11fontdir}/misc ]; then
%font_update_dirs -u misc || : xorg-x11-fonts-update-dirs --skip-fontscale %{_x11fontdir}/misc
fi fi
} }
%post Type1 %post Type1
{ {
%font_update_dirs -f Type1 || : xorg-x11-fonts-update-dirs %{_x11fontdir}/Type1
} }
%postun Type1 %postun Type1
{ {
if [ "$1" = "0" ]; then FONTDIR=%{_x11fontdir}/Type1
%font_update_dirs -u -f Type1 || : if [ "$1" = "0" -a -d $FONTDIR ]; then
xorg-x11-fonts-update-dirs $FONTDIR
fi fi
} }
%post ethiopic %post ethiopic
{ {
%font_update_dirs -t TTF || : xorg-x11-fonts-update-dirs --skip-fontscale --need-ttmkfdir %{_x11fontdir}/TTF
%font_update_dirs -f OTF || : xorg-x11-fonts-update-dirs %{_x11fontdir}/OTF
} }
%postun ethiopic %postun ethiopic
{ {
if [ "$1" = "0" ]; then FONTDIR=%{_x11fontdir}/TTF
%font_update_dirs -u -t TTF || : if [ "$1" = "0" -a -d $FONTDIR ]; then
%font_update_dirs -u -f OTF || : 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 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
} }
@ -950,55 +937,6 @@ 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