From 9c876300e18dfec51573dec28b3f01c0deccf49f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 20:57:06 +0000 Subject: [PATCH 01/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adobe-source-han-code-jp-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adobe-source-han-code-jp-fonts.spec b/adobe-source-han-code-jp-fonts.spec index 2234de6..73a7cd7 100644 --- a/adobe-source-han-code-jp-fonts.spec +++ b/adobe-source-han-code-jp-fonts.spec @@ -4,7 +4,7 @@ Name: adobe-source-han-code-jp-fonts Version: 2.011 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Adobe OpenType UI font for mixed Latin and Japanese text License: OFL @@ -51,6 +51,9 @@ ln -s %{_fontconfig_templatedir}/%{fontconf} \ %doc README.md relnotes.txt %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 2.011-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 2.011-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From fc3de8c1cd4ba67e7691b97217f1da4d175f5669 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Fri, 17 Jun 2022 19:55:47 +0900 Subject: [PATCH 02/15] Convert spec file etc to satisfy new packaging guidelines --- ... => 68-adobe-source-han-code-jp-fonts.conf | 2 +- adobe-source-han-code-jp-fonts.spec | 113 +++++++++++++----- tests/tests.yml | 2 +- 3 files changed, 82 insertions(+), 35 deletions(-) rename adobe-source-han-code-jp-fonts-fontconfig.conf => 68-adobe-source-han-code-jp-fonts.conf (90%) diff --git a/adobe-source-han-code-jp-fonts-fontconfig.conf b/68-adobe-source-han-code-jp-fonts.conf similarity index 90% rename from adobe-source-han-code-jp-fonts-fontconfig.conf rename to 68-adobe-source-han-code-jp-fonts.conf index 3488f32..4bf1ef6 100644 --- a/adobe-source-han-code-jp-fonts-fontconfig.conf +++ b/68-adobe-source-han-code-jp-fonts.conf @@ -1,5 +1,5 @@ - + diff --git a/adobe-source-han-code-jp-fonts.spec b/adobe-source-han-code-jp-fonts.spec index 73a7cd7..389728d 100644 --- a/adobe-source-han-code-jp-fonts.spec +++ b/adobe-source-han-code-jp-fonts.spec @@ -1,22 +1,69 @@ -%global fontname adobe-source-han-code-jp -%global fontconf 68-%{fontname}.conf -%global archivename source-han-code-jp-%{version}R +# Packaging template: basic single-family fonts packaging. +# +# SPDX-License-Identifier: MIT +# +# This template documents the minimal set of spec declarations, necessary to +# package a single font family, from a single dedicated source archive. +# +# It is part of the following set of packaging templates: +# “fonts-0-simple”: basic single-family fonts packaging +# “fonts-1-full”: less common patterns for single-family fonts packaging +# “fonts-2-multi”: multi-family fonts packaging +# “fonts-3-sub”: packaging fonts, released as part of something else +# +# A font family is composed of font files, that share a single design, and +# differ ONLY in: +# — Weight Bold, Black… +# – Width∕Stretch Narrow, Condensed, Expanded… +# — Slope/Slant Italic, Oblique +# Optical sizing Caption… +# +# Those parameters correspond to the default axes of OpenType variable fonts: +# https://docs.microsoft.com/en-us/typography/opentype/spec/dvaraxisreg#registered-axis-tags +# The variable fonts model is an extension of the WWS model described in the +# WPF Font Selection Model whitepaper (2007): +# https://msdnshared.blob.core.windows.net/media/MSDNBlogsFS/prod.evol.blogs.msdn.com/CommunityServer.Components.PostAttachments/00/02/24/90/36/WPF%20Font%20Selection%20Model.pdf +# +# Do not rely on the naming upstream chose, to define family boundaries, it +# will often be wrong. +# +# Declaration order is chosen to limit divergence between those templates, and +# simplify cut and pasting. +# +Version: 2.011 +Release: 8%{?dist} +URL: https://github.com/adobe-fonts/source-han-code-jp/ -Name: adobe-source-han-code-jp-fonts -Version: 2.011 -Release: 8%{?dist} -Summary: Adobe OpenType UI font for mixed Latin and Japanese text +# The identifier of the entity, that released the font family. +%global foundry adobe +# The font family license identifier. Adjust as necessary. The OFL is our +# recommended font license. +%global fontlicense OFL +# +# The following directives are lists of space-separated shell globs +# – matching files associated with the font family, +# – as they exist in the build root, +# — at the end of the %build stage: +# – legal files (licensing…) +%global fontlicenses LICENSE.txt +# – documentation files +%global fontdocs relnotes.txt README.md README-JP.md +# – exclusions from the ”fontdocs” list +%global fontdocsex %{fontlicenses} -License: OFL -URL: https://github.com/adobe-fonts/source-han-code-jp/ -Source0: https://github.com/adobe-fonts/source-han-code-jp/archive/%{version}R/%{archivename}.zip -Source1: %{name}-fontconfig.conf - -BuildArch: noarch -BuildRequires: fontpackages-devel -Requires: fontpackages-filesystem - -%description +# The human-friendly font family name, whitespace included, restricted to the +# the Basic Latin Unicode block. +%global fontfamily Source Han Code JP +%global fontsummary Adobe OpenType UI font for mixed Latin and Japanese text +# +# More shell glob lists: +# – font family files +%global fonts OTF/SourceHanCodeJP-RegularIt.otf OTF/SourceHanCodeJP-Regular.otf OTF/SourceHanCodeJP-NormalIt.otf OTF/SourceHanCodeJP-Normal.otf OTF/SourceHanCodeJP-MediumIt.otf OTF/SourceHanCodeJP-Medium.otf OTF/SourceHanCodeJP-LightIt.otf OTF/SourceHanCodeJP-Light.otf OTF/SourceHanCodeJP-HeavyIt.otf OTF/SourceHanCodeJP-Heavy.otf OTF/SourceHanCodeJP-ExtraLightIt.otf OTF/SourceHanCodeJP-ExtraLight.otf OTF/SourceHanCodeJP-BoldIt.otf OTF/SourceHanCodeJP-Bold.otf +# – fontconfig files +%global fontconfs %{SOURCE10} +# +# A multi-line description block for the generated package. +%global fontdescription %{expand: Source Han Code JP is a derivative of Source Han Sans that replaces its proportional Latin glyphs with fixed-width 667-unit glyphs from Source Code Pro. The Latin glyphs are scaled to match the glyphs for @@ -25,30 +72,30 @@ Japanese kana and kanji, and their widths are adjusted to be exactly used as a UI font for mixed Latin and Japanese text on displays, for programming, editing HTML/CSS, viewing text or inputing to the command line in a terminal app, and so on. +} + +Source0: https://github.com/adobe-fonts/source-han-code-jp/archive/2.011R/source-han-code-jp-2.011R.zip +# Adjust as necessary. Keeping the filename in sync with the package name is a good idea. +# See the fontconfig templates in fonts-rpm-templates for information on how to +# write good fontconfig files and choose the correct priority [number]. +Source10: 68-adobe-source-han-code-jp-fonts.conf + +%fontpkg %prep -%autosetup -n %{archivename} -chmod 0644 README.md +%setup -q -n source-han-code-jp-2.011R +chmod 0644 README.md README-JP.md %build +%fontbuild %install +%fontinstall -install -m 0755 -d %{buildroot}%{_fontdir} -install -m 0644 -p OTF/*.otf %{buildroot}%{_fontdir} +%check +%fontcheck -install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \ - %{buildroot}%{_fontconfig_confdir} - -install -m 0644 -p %{SOURCE1} \ - %{buildroot}%{_fontconfig_templatedir}/%{fontconf} -ln -s %{_fontconfig_templatedir}/%{fontconf} \ - %{buildroot}%{_fontconfig_confdir}/%{fontconf} - -%_font_pkg -f %{fontconf} *.otf - -%license LICENSE.txt -%doc README.md relnotes.txt +%fontfiles %changelog * Wed Jan 19 2022 Fedora Release Engineering - 2.011-8 diff --git a/tests/tests.yml b/tests/tests.yml index 53d1cfd..aa1a1c5 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -5,7 +5,7 @@ - role: custom-test-fonts required_packages: - adobe-source-han-code-jp-fonts - path_prefix: /usr/share/fonts/adobe-source-han-code-jp + path_prefix: /usr/share/fonts/adobe-source-han-code-jp-fonts package: adobe-source-han-code-jp-fonts coverage: - ja From 3500d89a989654d8482a22d6ba627ec894f70765 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 21 Jun 2022 14:39:11 +0900 Subject: [PATCH 03/15] Revise spec file for new packaging guidelines. --- adobe-source-han-code-jp-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adobe-source-han-code-jp-fonts.spec b/adobe-source-han-code-jp-fonts.spec index 389728d..5511d3e 100644 --- a/adobe-source-han-code-jp-fonts.spec +++ b/adobe-source-han-code-jp-fonts.spec @@ -31,7 +31,7 @@ # simplify cut and pasting. # Version: 2.011 -Release: 8%{?dist} +Release: 9%{?dist} URL: https://github.com/adobe-fonts/source-han-code-jp/ # The identifier of the entity, that released the font family. @@ -98,6 +98,9 @@ chmod 0644 README.md README-JP.md %fontfiles %changelog +* Tue Jun 21 2022 Akira TAGOH - 2.011-9 +- Revise spec file for new packaging guidelines. + * Wed Jan 19 2022 Fedora Release Engineering - 2.011-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From eccd4c39064a33d6572d96094b9919e0c753aa51 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Fri, 24 Jun 2022 20:24:05 +0900 Subject: [PATCH 04/15] trivial fix --- adobe-source-han-code-jp-fonts.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adobe-source-han-code-jp-fonts.spec b/adobe-source-han-code-jp-fonts.spec index 5511d3e..62edd56 100644 --- a/adobe-source-han-code-jp-fonts.spec +++ b/adobe-source-han-code-jp-fonts.spec @@ -83,7 +83,7 @@ Source10: 68-adobe-source-han-code-jp-fonts.conf %fontpkg %prep -%setup -q -n source-han-code-jp-2.011R +%setup -q -n source-han-code-jp-%{version}R chmod 0644 README.md README-JP.md %build From 68a34201afcdacf09df1fb4d1fa4e8d0da0e9ec3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:27:55 +0000 Subject: [PATCH 05/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adobe-source-han-code-jp-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adobe-source-han-code-jp-fonts.spec b/adobe-source-han-code-jp-fonts.spec index 62edd56..5fb409e 100644 --- a/adobe-source-han-code-jp-fonts.spec +++ b/adobe-source-han-code-jp-fonts.spec @@ -31,7 +31,7 @@ # simplify cut and pasting. # Version: 2.011 -Release: 9%{?dist} +Release: 10%{?dist} URL: https://github.com/adobe-fonts/source-han-code-jp/ # The identifier of the entity, that released the font family. @@ -98,6 +98,9 @@ chmod 0644 README.md README-JP.md %fontfiles %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 2.011-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Tue Jun 21 2022 Akira TAGOH - 2.011-9 - Revise spec file for new packaging guidelines. From 46f07a2563b948c7ff69b87962adf98360538e2d Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 29 Nov 2022 17:58:30 +0900 Subject: [PATCH 06/15] Convert License tag to SPDX. --- adobe-source-han-code-jp-fonts.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/adobe-source-han-code-jp-fonts.spec b/adobe-source-han-code-jp-fonts.spec index 5fb409e..deb1c1d 100644 --- a/adobe-source-han-code-jp-fonts.spec +++ b/adobe-source-han-code-jp-fonts.spec @@ -31,14 +31,14 @@ # simplify cut and pasting. # Version: 2.011 -Release: 10%{?dist} +Release: 11%{?dist} URL: https://github.com/adobe-fonts/source-han-code-jp/ # The identifier of the entity, that released the font family. %global foundry adobe # The font family license identifier. Adjust as necessary. The OFL is our # recommended font license. -%global fontlicense OFL +%global fontlicense OFL-1.1 # # The following directives are lists of space-separated shell globs # – matching files associated with the font family, @@ -98,6 +98,9 @@ chmod 0644 README.md README-JP.md %fontfiles %changelog +* Tue Nov 29 2022 Akira TAGOH - 2.011-11 +- Convert License tag to SPDX. + * Wed Jul 20 2022 Fedora Release Engineering - 2.011-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 0f1e369809cc3c11c509087387440f7a9541e785 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:25:13 +0000 Subject: [PATCH 07/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adobe-source-han-code-jp-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adobe-source-han-code-jp-fonts.spec b/adobe-source-han-code-jp-fonts.spec index deb1c1d..fbf7e61 100644 --- a/adobe-source-han-code-jp-fonts.spec +++ b/adobe-source-han-code-jp-fonts.spec @@ -31,7 +31,7 @@ # simplify cut and pasting. # Version: 2.011 -Release: 11%{?dist} +Release: 12%{?dist} URL: https://github.com/adobe-fonts/source-han-code-jp/ # The identifier of the entity, that released the font family. @@ -98,6 +98,9 @@ chmod 0644 README.md README-JP.md %fontfiles %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 2.011-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Nov 29 2022 Akira TAGOH - 2.011-11 - Convert License tag to SPDX. From 64c17f25d3ba04ed5c5277f245a8fb7e23788a35 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 12:55:48 +0000 Subject: [PATCH 08/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adobe-source-han-code-jp-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adobe-source-han-code-jp-fonts.spec b/adobe-source-han-code-jp-fonts.spec index fbf7e61..eeaaa76 100644 --- a/adobe-source-han-code-jp-fonts.spec +++ b/adobe-source-han-code-jp-fonts.spec @@ -31,7 +31,7 @@ # simplify cut and pasting. # Version: 2.011 -Release: 12%{?dist} +Release: 13%{?dist} URL: https://github.com/adobe-fonts/source-han-code-jp/ # The identifier of the entity, that released the font family. @@ -98,6 +98,9 @@ chmod 0644 README.md README-JP.md %fontfiles %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 2.011-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 2.011-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 70e90635a60b4a5d0d88f1251a80625c1fb7ecf6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:13:42 +0000 Subject: [PATCH 09/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- adobe-source-han-code-jp-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adobe-source-han-code-jp-fonts.spec b/adobe-source-han-code-jp-fonts.spec index eeaaa76..6658035 100644 --- a/adobe-source-han-code-jp-fonts.spec +++ b/adobe-source-han-code-jp-fonts.spec @@ -31,7 +31,7 @@ # simplify cut and pasting. # Version: 2.011 -Release: 13%{?dist} +Release: 14%{?dist} URL: https://github.com/adobe-fonts/source-han-code-jp/ # The identifier of the entity, that released the font family. @@ -98,6 +98,9 @@ chmod 0644 README.md README-JP.md %fontfiles %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 2.011-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 2.011-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 91863e9e898e37e386a9e18a517319a847db21e2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:41:25 +0000 Subject: [PATCH 10/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- adobe-source-han-code-jp-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adobe-source-han-code-jp-fonts.spec b/adobe-source-han-code-jp-fonts.spec index 6658035..52b7799 100644 --- a/adobe-source-han-code-jp-fonts.spec +++ b/adobe-source-han-code-jp-fonts.spec @@ -31,7 +31,7 @@ # simplify cut and pasting. # Version: 2.011 -Release: 14%{?dist} +Release: 15%{?dist} URL: https://github.com/adobe-fonts/source-han-code-jp/ # The identifier of the entity, that released the font family. @@ -98,6 +98,9 @@ chmod 0644 README.md README-JP.md %fontfiles %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 2.011-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 2.011-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From c15407fa5e14cebaacd1fcfa9a85673e0fea7e49 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 25 Jun 2024 14:38:35 +0900 Subject: [PATCH 11/15] ci: Migrate CI to tmt based --- .fmf/version | 1 + plans/adobe-source-han-code-jp-fonts.fmf | 11 + .../roles/custom-test-fonts/defaults/main.yml | 7 - .../custom-test-fonts/files/run-family-test | 162 ------------ .../files/run-lang-coverage-test | 233 ------------------ tests/roles/custom-test-fonts/meta/main.yml | 4 - tests/roles/custom-test-fonts/tasks/main.yml | 52 ---- tests/tests.yml | 15 -- 8 files changed, 12 insertions(+), 473 deletions(-) create mode 100644 .fmf/version create mode 100644 plans/adobe-source-han-code-jp-fonts.fmf delete mode 100644 tests/roles/custom-test-fonts/defaults/main.yml delete mode 100755 tests/roles/custom-test-fonts/files/run-family-test delete mode 100755 tests/roles/custom-test-fonts/files/run-lang-coverage-test delete mode 100644 tests/roles/custom-test-fonts/meta/main.yml delete mode 100644 tests/roles/custom-test-fonts/tasks/main.yml delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans/adobe-source-han-code-jp-fonts.fmf b/plans/adobe-source-han-code-jp-fonts.fmf new file mode 100644 index 0000000..a136c80 --- /dev/null +++ b/plans/adobe-source-han-code-jp-fonts.fmf @@ -0,0 +1,11 @@ +summary: Fonts related tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/fonts +execute: + how: tmt +environment: + PACKAGE: adobe-source-han-code-jp-fonts + FONT_ALIAS: monospace + FONT_FAMILY: Source Han Code JP + FONT_LANG: ja diff --git a/tests/roles/custom-test-fonts/defaults/main.yml b/tests/roles/custom-test-fonts/defaults/main.yml deleted file mode 100644 index fe09145..0000000 --- a/tests/roles/custom-test-fonts/defaults/main.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -role_pkgs_req: - - fontconfig - - fontconfig-devel - - pkg-config - - rsync diff --git a/tests/roles/custom-test-fonts/files/run-family-test b/tests/roles/custom-test-fonts/files/run-family-test deleted file mode 100755 index bbbed73..0000000 --- a/tests/roles/custom-test-fonts/files/run-family-test +++ /dev/null @@ -1,162 +0,0 @@ -#! /bin/bash -efu - -debug() { - if [ -n "$DEBUG" ]; then - echo "$*" >&2 - fi -} - -msg_usage() { - cat <<_EOF_ -Run family test. - -Usage: -$PROG - -Options: --h, --help Display this help and exit --v, --verbose Turn on debug --l, --lang=LANG Test LANG language coverage (default: en) --f, --family=FILE Set a family name supposed to be assigned for alias. --g, --alias=STR Set an alias name. (default: sans-serif) --a, --artifactsdir=DIR Set environment dir to store artifacts --k, --package=NAME Set a package name for fonts. -_EOF_ -} - -PROG="${PROG:-${0##*/}}" -DEBUG="${DEBUG:-}" -OPT_LANG="${OPT_LANG:-en}" -OPT_FAMILY="${OPT_FAMILY:-}" -OPT_ARTIFACTS_DIR="${OPT_ARTIFACTS_DIR:-}" -OPT_ALIAS="${OPT_ALIAS:-sans-serif}" -OPT_PACKAGE="${OPT_PACKAGE:-}" - -opt=$(getopt -n "$0" --options "hvl:f:t:a:g:k:" --longoptions "help,verbose,lang:,family:,test:,artifactsdir:,alias:,package:" -- "$@") -eval set -- "$opt" -while [[ $# -gt 0 ]]; do - case "$1" in - -k|--package) - OPT_PACKAGE="$2" - shift 2 - ;; - -g|--alias) - OPT_ALIAS="$2" - shift 2 - ;; - -a|--artifactsdir) - OPT_ARTIFACTS_DIR="$2" - shift 2 - ;; - -f|--family) - OPT_FAMILY="$2" - shift 2 - ;; - -l|--lang) - OPT_LANG="$2" - shift 2 - ;; - -v|--verbose) - DEBUG="-v" - shift - ;; - -h|--help) - msg_usage - exit 0 - ;; - --) - shift - ;; - *) - msg_usage - exit 1 - esac -done - -if [ -z "$OPT_ARTIFACTS_DIR" ] || [ -z "$OPT_LANG" ] || [ -z "$OPT_FAMILY" ]; then - echo "Use: $PROG -h for help." - exit 0 -fi - -debug "Alias: $OPT_ALIAS" -debug "Family: $OPT_FAMILY" -debug "Lang: $OPT_LANG" -debug "Artifacts dir: $OPT_ARTIFACTS_DIR" -debug "Package name: $OPT_PACKAGE" -STR_TEST_DASHED=$(echo "${OPT_PACKAGE}_${OPT_ALIAS}_${OPT_LANG}" | sed -e 's/\//-/g' -e 's/ /-/g') -debug "Log file: $STR_TEST_DASHED.log" - -clean_exit() { - rc=$?; - trap - SIGINT SIGTERM SIGABRT EXIT - echo "Run test $OPT_ALIAS: done. Test's exit code: $rc" - for pid in $(ps -o pid --no-headers --ppid $$); do - if [ -n "$(ps -p $pid -o pid=)" ]; then - kill -s HUP $pid - fi - done - local log_file_name="$STR_TEST_DASHED.log" - local log_file_path="$OPT_ARTIFACTS_DIR/$log_file_name" - local status - if [[ $rc -eq 127 ]]; then - status="ERROR" - elif grep -q "RESULT: WARN" "$log_file_path"; then - status="ERROR" - elif grep -q "RESULT: FAIL" "$log_file_path"; then - status="FAIL" - elif grep -q "RESULT: PASS" "$log_file_path"; then - status="PASS" - elif grep -q "FAIL" "$log_file_path"; then - status="FAIL" - elif grep -q "PASS" "$log_file_path"; then - status="PASS" - else - status="ERROR" - fi - echo "$status $OPT_ALIAS" >> "$OPT_ARTIFACTS_DIR/test.log" - mv "$log_file_path" "$OPT_ARTIFACTS_DIR/${status}-${log_file_name}" - local results="$OPT_ARTIFACTS_DIR/results.yml" - local result=$(echo $status | tr '[:upper:]' '[:lower:]') - test -f "$results" || echo 'results:' > "$results" - printf '%s\n' '' \ - "- test: $OPT_ALIAS" \ - " result: $result" \ - " logs:" \ - " - ${status}_${log_file_name}" \ - >> "$results" - exit 0 -} -trap clean_exit SIGINT SIGTERM SIGABRT EXIT - -cachedir=`pkg-config --variable cachedir fontconfig` -tmpconfd=`mktemp --tmpdir -d fontsci.XXXXXXXX` -conf=$(for i in `rpm -ql $OPT_PACKAGE | grep conf.d`; do - echo "$i" -done) -cat <<_EOF_> $tmpconfd/fonts.conf - - /usr/share/fonts - $conf - $cachedir - -_EOF_ -debug "Config: `cat $tmpconfd/fonts.conf`" - -mkdir -p "$OPT_ARTIFACTS_DIR" -export OUTPUTFILE="$(realpath "$OPT_ARTIFACTS_DIR")/$STR_TEST_DASHED-out.log" -logfile="$OPT_ARTIFACTS_DIR/$STR_TEST_DASHED.log" -logfile="$(realpath "$logfile")" -exec > >(tee -a "$logfile") 2>&1 - -debug "Check family assignment" -res=`FONTCONFIG_FILE=$tmpconfd/fonts.conf fc-match -f "%{family[0]}" :family=$OPT_ALIAS:lang=$OPT_LANG` -ret=0 -if [ "x$res" = "x$OPT_FAMILY" ]; then - echo "RESULT: PASS: $OPT_FAMILY was assigned to $OPT_ALIAS as expected" -else - echo "RESULT: FAIL: $OPT_FAMILY wasn't assigned to $OPT_ALIAS (actual result: $res)" - ret=1 -fi -rm -rf $tmpconfd - -exit $ret diff --git a/tests/roles/custom-test-fonts/files/run-lang-coverage-test b/tests/roles/custom-test-fonts/files/run-lang-coverage-test deleted file mode 100755 index 299f06b..0000000 --- a/tests/roles/custom-test-fonts/files/run-lang-coverage-test +++ /dev/null @@ -1,233 +0,0 @@ -#! /bin/bash -efu - -debug() { - if [ -n "$DEBUG" ]; then - echo "$*" >&2 - fi -} - -msg_usage() { - cat <<_EOF_ -Run language coverage test. - -Usage: -$PROG - -Options: --h, --help Display this help and exit --v, --verbose Turn on debug --l, --lang=LANG Test LANG language coverage (default: en) --p, --path=PATH Test fonts on PATH --n, --name=NAME Set NAME to store a log file. --a, --artifactsdir=DIR test environment dir to store artifacts --e, --exclude=FILE Exclude FILE to check. --i, --include=FILE Include File to check. -_EOF_ -} - -PROG="${PROG:-${0##*/}}" -DEBUG="${DEBUG:-}" -OPT_LANG="${OPT_LANG:-en}" -OPT_PATH=() -OPT_ARTIFACTS_DIR="${OPT_ARTIFACTS_DIR:-}" -OPT_EXCLUDE=() -OPT_INCLUDE=() -OPT_NAME="${OPT_NAME:-}" - -opt=$(getopt -n "$0" --options "hvl:p:n:a:e:i:" --longoptions "help,verbose,lang:,path:,name:,artifactsdir:,exclude:,include:" -- "$@") -eval set -- "$opt" -while [[ $# -gt 0 ]]; do - case "$1" in - -n|--name) - OPT_NAME="$2" - shift 2 - ;; - -i|--include) - OPT_INCLUDE+=("$2") - shift 2 - ;; - -e|--exclude) - OPT_EXCLUDE+=("$2") - shift 2 - ;; - -a|--artifactsdir) - OPT_ARTIFACTS_DIR="$2" - shift 2 - ;; - -p|--path) - OPT_PATH+=("$2") - shift 2 - ;; - -l|--lang) - OPT_LANG="$2" - shift 2 - ;; - -v|--verbose) - DEBUG="-v" - shift - ;; - -h|--help) - msg_usage - exit 0 - ;; - --) - shift - ;; - *) - msg_usage - exit 1 - esac -done - -if [ -z "$OPT_ARTIFACTS_DIR" ] || [ -z "$OPT_LANG" ] || [ -z "$OPT_PATH" ]; then - echo "Use: $PROG -h for help." - exit 0 -fi - -STR_TEST_DASHED=$(echo "${OPT_NAME:-$OPT_LANG}" | sed -e 's/\//-/g') - -clean_exit() { - rc=$?; - trap - SIGINT SIGTERM SIGABRT EXIT - echo "Run test $OPT_LANG: done. Test's exit code: $rc" - for pid in $(ps -o pid --no-headers --ppid $$); do - if [ -n "$(ps -p $pid -o pid=)" ]; then - kill -s HUP $pid - fi - done - local log_file_name="$STR_TEST_DASHED.log" - local log_file_path="$OPT_ARTIFACTS_DIR/$log_file_name" - local status - if [[ $rc -eq 127 ]]; then - status="ERROR" - elif grep -q "RESULT: WARN" "$log_file_path"; then - status="ERROR" - elif grep -q "RESULT: FAIL" "$log_file_path"; then - status="FAIL" - elif grep -q "RESULT: PASS" "$log_file_path"; then - status="PASS" - elif grep -q "WARN" "$log_file_path"; then - status="ERROR" - elif grep -q "FAIL" "$log_file_path"; then - status="FAIL" - elif grep -q "PASS" "$log_file_path"; then - status="PASS" - else - status="ERROR" - fi - echo "$status $OPT_LANG" >> "$OPT_ARTIFACTS_DIR/test.log" - mv "$log_file_path" "$OPT_ARTIFACTS_DIR/${status}-${log_file_name}" - local results="$OPT_ARTIFACTS_DIR/results.yml" - local result=$(echo $status | tr '[:upper:]' '[:lower:]') - test -f "$results" || echo 'results:' > "$results" - printf '%s\n' '' \ - "- test: $OPT_LANG" \ - " result: $result" \ - " logs:" \ - " - ${status}_${log_file_name}" \ - >> "$results" - exit 0 -} -trap clean_exit SIGINT SIGTERM SIGABRT EXIT - -mkdir -p "$OPT_ARTIFACTS_DIR" -export OUTPUTFILE="$(realpath "$OPT_ARTIFACTS_DIR")/$STR_TEST_DASHED-out.log" -logfile="$OPT_ARTIFACTS_DIR/$STR_TEST_DASHED.log" -logfile="$(realpath "$logfile")" -exec > >(tee -a "$logfile") 2>&1 - -expand_regex() { - local p ret=() - local regex="$1" - shift - debug "Expanding $regex" - for p; do - set +f - debug "$p: $regex" - (cd $p; - local x=$(find -regextype posix-egrep -regex "./$regex" -print|sed -e 's,^\./,,g') - debug "$x" - ret+=($x) - set -f - echo -n ${ret[@]} - ) - done - echo -n ${ret[@]} -} - -iv=() -ev=() -x=() -for p in ${OPT_INCLUDE[@]}; do - x=$(expand_regex $p ${OPT_PATH[@]}) - if [ "x$x" == "x" ]; then - echo "RESULT: WARN: No matches on \"$p\". maybe typo or something changed?" - continue - fi - iv=("${iv[@]}" "${x[@]}") -done -for p in ${OPT_EXCLUDE[@]}; do - x=$(expand_regex $p ${OPT_PATH[@]}) - if [ "x$x" == "x" ]; then - echo "RESULT: WARN: No matches on \"$p\". maybe typo or something changed?" - continue - fi - ev=("${ev[@]}" "${x[@]}") -done -OPT_EXCLUDE=(${ev[@]}) -OPT_INCLUDE=(${iv[@]}) - -debug "Path: ${OPT_PATH[@]}" -debug "Lang: $OPT_LANG" -debug "Artifacts dir: $OPT_ARTIFACTS_DIR" -debug "Exclude: ${#OPT_EXCLUDE[@]}: ${OPT_EXCLUDE[@]}" -debug "Include: ${#OPT_INCLUDE[@]}: ${OPT_INCLUDE[@]}" - -contains() { - local e match="$1" - shift - for e; do [[ "$e" == "$match" ]] && return 1; done - return 0 -} - -debug "Check language coverage" -ret=0 -set +f -for p in ${OPT_PATH[@]}; do - for i in `find $p -regex '.*/*\.\(t1\)?\(ttf\)?\(otf\)?\(ttc\)?\(pcf.*\)?\(pfa\)?'`; do - set -f - debug "$i" - if test -f $i; then - n=`basename $i` - set +e - contains "$n" "${OPT_EXCLUDE[@]}" - ret=$? - set -e - if [ $ret -eq 1 ]; then - debug "ignoring $i" - continue - fi - if [ ${#OPT_INCLUDE[@]} -ne 0 ]; then - set +e - contains "$n" "${OPT_INCLUDE[@]}" - ret=$? - set -e - if [ $ret -eq 0 ]; then - debug "$i isn't targeted file" - continue - fi - NOT_MATCHED=("${NOT_MATCHED[@]/$n}") - fi - debug " $i" - res=`fc-validate -l $OPT_LANG $i || :` - if echo $res | grep -q Missing; then - echo "RESULT: FAIL: $i doesn't satisfy $OPT_LANG language coverage." - ret=1 - else - echo "RESULT: PASS: $i satisfy $OPT_LANG language coverage." - fi - fi - done -done - -exit $ret diff --git a/tests/roles/custom-test-fonts/meta/main.yml b/tests/roles/custom-test-fonts/meta/main.yml deleted file mode 100644 index f6d273c..0000000 --- a/tests/roles/custom-test-fonts/meta/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -dependencies: - - role: str-common-init diff --git a/tests/roles/custom-test-fonts/tasks/main.yml b/tests/roles/custom-test-fonts/tasks/main.yml deleted file mode 100644 index 2665795..0000000 --- a/tests/roles/custom-test-fonts/tasks/main.yml +++ /dev/null @@ -1,52 +0,0 @@ ---- - -- block: - - name: language coverage - environment: - LANG: "en_US.UTF-8" - script: run-lang-coverage-test --lang "{{ item }}" {% if coverage.values is not defined or coverage[item].path_prefix is not defined %} --path {{ path_prefix }} {% else %} {{ '--path "' + (coverage[item].path_prefix | join('" --path "')) + '"' }} {% endif %} --artifactsdir "{{ remote_artifacts }}" {{ "" if coverage.values is not defined or coverage[item].name is not defined else "--name " + coverage[item].name }} {{ "" if coverage.values is not defined or coverage[item].exclude is not defined else '--exclude "' + (coverage[item].exclude | join('" --exclude "')) + '"'}} {{ "" if coverage.values is not defined or coverage[item].include is not defined else '--include "' + (coverage[item].include | join('" --include "')) + '"'}} - with_items: - - "{{ coverage if coverage.keys is not defined else coverage.keys()|list }}" - - name: generic family assignment - environment: - LANG: "en_US.UTF-8" - when: families is defined - script: run-family-test --lang {{ item.lang }} --family '{{ item.family }}' --alias {{ item.alias }} --artifactsdir {{ remote_artifacts }} --package {{ package if item.package is not defined else item.package }} - with_items: - - "{{ families }}" - - - name: Collect all of failures into one file - shell: | - grep -v PASS "{{ remote_artifacts }}"/FAIL_*.log > "{{ remote_artifacts }}"/FAIL-all.log || : - - - name: Check the results - shell: | - log="{{ remote_artifacts }}/test.log" - if [ ! -f "$log" ]; then - echo ERROR - echo "Test results not found." 1>&2 - elif grep ^ERROR "$log" 1>&2; then - echo ERROR - elif grep ^FAIL "$log" 1>&2; then - echo FAIL - elif grep -q ^PASS "$log"; then - echo PASS - else - echo ERROR - echo "No test results found." 1>&2 - fi - register: test_results - - - name: Set role result - set_fact: - role_result: "{{ test_results.stdout }}" - role_message: "{{ test_results.stderr|d('test execution error.') }}" - role_result_failed: "{{ test_results.stdout != 'PASS' }}" - role_result_msg: "{{ test_results.stderr|d('test execution error.') }}" - - - include_role: - name: str-common-final - - - name: Validate the result - shell: echo "test_results.stdout" - failed_when: test_results.stdout != 'PASS' diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index aa1a1c5..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: localhost - tags: - - classic - roles: - - role: custom-test-fonts - required_packages: - - adobe-source-han-code-jp-fonts - path_prefix: /usr/share/fonts/adobe-source-han-code-jp-fonts - package: adobe-source-han-code-jp-fonts - coverage: - - ja - families: - - lang: ja - alias: monospace - family: Source Han Code JP From b965351ad720842625c533ea7df11fd89af5e5dc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:37:30 +0000 Subject: [PATCH 12/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- adobe-source-han-code-jp-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adobe-source-han-code-jp-fonts.spec b/adobe-source-han-code-jp-fonts.spec index 52b7799..6ab5b20 100644 --- a/adobe-source-han-code-jp-fonts.spec +++ b/adobe-source-han-code-jp-fonts.spec @@ -31,7 +31,7 @@ # simplify cut and pasting. # Version: 2.011 -Release: 15%{?dist} +Release: 16%{?dist} URL: https://github.com/adobe-fonts/source-han-code-jp/ # The identifier of the entity, that released the font family. @@ -98,6 +98,9 @@ chmod 0644 README.md README-JP.md %fontfiles %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 2.011-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 2.011-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 6459d447ff50666faee499ab0e109c44138aa7a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:36:45 +0000 Subject: [PATCH 13/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- adobe-source-han-code-jp-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adobe-source-han-code-jp-fonts.spec b/adobe-source-han-code-jp-fonts.spec index 6ab5b20..4868462 100644 --- a/adobe-source-han-code-jp-fonts.spec +++ b/adobe-source-han-code-jp-fonts.spec @@ -31,7 +31,7 @@ # simplify cut and pasting. # Version: 2.011 -Release: 16%{?dist} +Release: 17%{?dist} URL: https://github.com/adobe-fonts/source-han-code-jp/ # The identifier of the entity, that released the font family. @@ -98,6 +98,9 @@ chmod 0644 README.md README-JP.md %fontfiles %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 2.011-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 17 2024 Fedora Release Engineering - 2.011-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From c61c7849c7437e3f1ddfbe3df923323203bdcfb6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:46:11 +0000 Subject: [PATCH 14/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- adobe-source-han-code-jp-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adobe-source-han-code-jp-fonts.spec b/adobe-source-han-code-jp-fonts.spec index 4868462..9d1f777 100644 --- a/adobe-source-han-code-jp-fonts.spec +++ b/adobe-source-han-code-jp-fonts.spec @@ -31,7 +31,7 @@ # simplify cut and pasting. # Version: 2.011 -Release: 17%{?dist} +Release: 18%{?dist} URL: https://github.com/adobe-fonts/source-han-code-jp/ # The identifier of the entity, that released the font family. @@ -98,6 +98,9 @@ chmod 0644 README.md README-JP.md %fontfiles %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 2.011-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 2.011-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 8157b9d09858546d42412f89e98d6c5626752bb6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:27:39 +0000 Subject: [PATCH 15/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- adobe-source-han-code-jp-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adobe-source-han-code-jp-fonts.spec b/adobe-source-han-code-jp-fonts.spec index 9d1f777..6a5d38b 100644 --- a/adobe-source-han-code-jp-fonts.spec +++ b/adobe-source-han-code-jp-fonts.spec @@ -31,7 +31,7 @@ # simplify cut and pasting. # Version: 2.011 -Release: 18%{?dist} +Release: 19%{?dist} URL: https://github.com/adobe-fonts/source-han-code-jp/ # The identifier of the entity, that released the font family. @@ -98,6 +98,9 @@ chmod 0644 README.md README-JP.md %fontfiles %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 2.011-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 2.011-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild