Compare commits
No commits in common. "c8s" and "c10s" have entirely different histories.
@ -1,6 +1,6 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-8
|
||||
- rhel-9
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
# this is the testcase identifier, which OSCI pipeline uses
|
||||
|
@ -1,38 +1,40 @@
|
||||
#!/usr/bin/bash -x
|
||||
|
||||
# Generate for google-noto-sans-cjk-ttc-fonts
|
||||
python3 genfontconf.py "ja" "monospace" "Noto Sans Mono CJK JP" "ja" "sans-serif" "Noto Sans CJK JP" "ko" "monospace" "Noto Sans Mono CJK KR" "ko" "sans-serif" "Noto Sans CJK KR" "zh-cn:zh-sg" "monospace" "Noto Sans Mono CJK SC" "zh-cn:zh-sg" "sans-serif" "Noto Sans CJK SC" "zh-tw:zh-hk" "monospace" "Noto Sans Mono CJK TC" "zh-tw:zh-hk" "sans-serif" "Noto Sans CJK TC" | xmllint --format - |tee 65-0-google-noto-sans-cjk-ttc.conf
|
||||
python3 genfontconf.py "ja" "monospace" "Noto Sans Mono CJK JP" \
|
||||
"ja" "sans-serif" "Noto Sans CJK JP" \
|
||||
"ko" "monospace" "Noto Sans Mono CJK KR" \
|
||||
"ko" "sans-serif" "Noto Sans CJK KR" \
|
||||
"zh-cn:zh-sg" "monospace" "Noto Sans Mono CJK SC" \
|
||||
"zh-cn:zh-sg" "sans-serif" "Noto Sans CJK SC" \
|
||||
"zh-tw:zh-mo" "monospace" "Noto Sans Mono CJK TC" \
|
||||
"zh-tw:zh-mo" "sans-serif" "Noto Sans CJK TC" \
|
||||
"zh-hk" "monospace" "Noto Sans Mono CJK HK" \
|
||||
"zh-hk" "sans-serif" "Noto Sans CJK HK" \
|
||||
| xmllint --format - |tee 65-0-google-noto-sans-cjk-ttc.conf
|
||||
|
||||
# Generate for google-noto-serif-cjk-ttc-fonts
|
||||
python3 genfontconf.py "ja" "serif" "Noto Serif CJK JP" "ko" "serif" "Noto Serif CJK KR" "zh-cn:zh-sg" "serif" "Noto Serif CJK SC" "zh-tw:zh-hk" "serif" "Noto Serif CJK TC" | xmllint --format - |tee 65-0-google-noto-serif-cjk-ttc.conf
|
||||
python3 genfontconf.py "ja" "serif" "Noto Serif CJK JP" \
|
||||
"ko" "serif" "Noto Serif CJK KR" \
|
||||
"zh-cn:zh-sg" "serif" "Noto Serif CJK SC" \
|
||||
"zh-tw:zh-hk:zh-mo" "serif" "Noto Serif CJK TC" \
|
||||
| xmllint --format - |tee 65-0-google-noto-serif-cjk-ttc.conf
|
||||
|
||||
# Generate for google-noto-sans-cjk-jp-fonts, google-noto-serif-cjk-jp-fonts and google-noto-sans-mono-cjk-jp-fonts
|
||||
# Generate for google-noto-sans-cjk-jp-fonts and google-noto-sans-mono-cjk-jp-fonts
|
||||
python3 genfontconf.py "ja" "sans-serif" "Noto Sans CJK JP" | xmllint --format - |tee 66-google-noto-sans-cjk-jp.conf
|
||||
|
||||
python3 genfontconf.py "ja" "serif" "Noto Serif CJK JP" | xmllint --format - |tee 66-google-noto-serif-cjk-jp.conf
|
||||
|
||||
python3 genfontconf.py "ja" "monospace" "Noto Sans Mono CJK JP" | xmllint --format - |tee 66-google-noto-sans-mono-cjk-jp.conf
|
||||
|
||||
# Generate for google-noto-sans-cjk-kr-fonts, google-noto-serif-cjk-kr-fonts and google-noto-sans-mono-cjk-kr-fonts
|
||||
python3 genfontconf.py "ko" "sans-serif" "Noto Sans CJK KR" | xmllint --format - |tee 66-google-noto-sans-cjk-kr.conf
|
||||
|
||||
python3 genfontconf.py "ko" "serif" "Noto Serif CJK KR" | xmllint --format - |tee 66-google-noto-serif-cjk-kr.conf
|
||||
|
||||
# Generate for google-noto-sans-mono-cjk-kr-fonts
|
||||
python3 genfontconf.py "ko" "monospace" "Noto Sans Mono CJK KR" | xmllint --format - |tee 66-google-noto-sans-mono-cjk-kr.conf
|
||||
|
||||
# Generate for google-noto-sans-cjk-sc-fonts, google-noto-serif-cjk-sc-fonts and google-noto-sans-mono-cjk-sc-fonts
|
||||
python3 genfontconf.py "zh-cn:zh-sg" "sans-serif" "Noto Sans CJK SC" | xmllint --format - |tee 66-google-noto-sans-cjk-sc.conf
|
||||
|
||||
python3 genfontconf.py "zh-cn:zh-sg" "serif" "Noto Serif CJK SC" | xmllint --format - |tee 66-google-noto-serif-cjk-sc.conf
|
||||
|
||||
# Generate for google-noto-sans-mono-cjk-sc-fonts
|
||||
python3 genfontconf.py "zh-cn:zh-sg" "monospace" "Noto Sans Mono CJK SC" | xmllint --format - |tee 66-google-noto-sans-mono-cjk-sc.conf
|
||||
|
||||
# Generate for google-noto-sans-cjk-tc-fonts, google-noto-serif-cjk-tc-fonts and google-noto-sans-mono-cjk-tc-fonts
|
||||
python3 genfontconf.py "zh-tw:zh-hk" "sans-serif" "Noto Sans CJK TC" | xmllint --format - |tee 66-google-noto-sans-cjk-tc.conf
|
||||
# Generate for google-noto-sans-mono-cjk-tc-fonts
|
||||
python3 genfontconf.py "zh-tw:zh-mo" "monospace" "Noto Sans Mono CJK TC" | xmllint --format - |tee 66-google-noto-sans-mono-cjk-tc.conf
|
||||
|
||||
python3 genfontconf.py "zh-tw:zh-hk" "serif" "Noto Serif CJK TC" | xmllint --format - |tee 66-google-noto-serif-cjk-tc.conf
|
||||
|
||||
python3 genfontconf.py "zh-tw:zh-hk" "monospace" "Noto Sans Mono CJK TC" | xmllint --format - |tee 66-google-noto-sans-mono-cjk-tc.conf
|
||||
# Generate for google-noto-sans-mono-cjk-hk-fonts
|
||||
python3 genfontconf.py "zh-hk" "monospace" "Noto Sans Mono CJK HK" | xmllint --format - |tee 66-google-noto-sans-mono-cjk-hk.conf
|
||||
|
||||
# Generate for google-noto-sans-jp-fonts and google-noto-serif-jp-fonts
|
||||
python3 genfontconf.py "ja" "sans-serif" "Noto Sans JP" | xmllint --format - |tee 66-google-noto-sans-jp.conf
|
||||
@ -50,6 +52,9 @@ python3 genfontconf.py "zh-cn:zh-sg" "sans-serif" "Noto Sans SC" | xmllint --for
|
||||
python3 genfontconf.py "zh-cn:zh-sg" "serif" "Noto Serif SC" | xmllint --format - |tee 66-google-noto-serif-sc.conf
|
||||
|
||||
# Generate for google-noto-sans-tc-fonts and google-noto-serif-tc-fonts
|
||||
python3 genfontconf.py "zh-tw:zh-hk" "sans-serif" "Noto Sans TC" | xmllint --format - |tee 66-google-noto-sans-tc.conf
|
||||
python3 genfontconf.py "zh-tw:zh-mo" "sans-serif" "Noto Sans TC" | xmllint --format - |tee 66-google-noto-sans-tc.conf
|
||||
|
||||
python3 genfontconf.py "zh-tw:zh-hk" "serif" "Noto Serif TC" | xmllint --format - |tee 66-google-noto-serif-tc.conf
|
||||
python3 genfontconf.py "zh-tw:zh-hk:zh-mo" "serif" "Noto Serif TC" | xmllint --format - |tee 66-google-noto-serif-tc.conf
|
||||
|
||||
# Generate for google-noto-sans-hk-fonts
|
||||
python3 genfontconf.py "zh-hk" "sans-serif" "Noto Sans HK" | xmllint --format - |tee 66-google-noto-sans-hk.conf
|
||||
|
@ -14,7 +14,7 @@ supported for compatibility with CJK standards. \
|
||||
|
||||
Name: google-noto-cjk-fonts
|
||||
Version: 20230817
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: Google Noto Sans CJK Fonts
|
||||
|
||||
License: OFL
|
||||
@ -29,7 +29,6 @@ Source6: https://github.com/notofonts/noto-cjk/releases/download/Sans%{sa
|
||||
Source7: https://github.com/notofonts/noto-cjk/releases/download/Sans%{sans_version}/15_NotoSansMonoCJKhk.zip
|
||||
|
||||
Source10: https://github.com/notofonts/noto-cjk/releases/download/Serif%{serif_version}/04_NotoSerifCJKOTC.zip
|
||||
Source11: https://github.com/notofonts/noto-cjk/releases/download/Serif%{serif_version}/05_NotoSerifCJKOTF.zip
|
||||
Source12: https://github.com/notofonts/noto-cjk/releases/download/Serif%{serif_version}/06_NotoSerifCJKSubsetOTF.zip
|
||||
|
||||
Source21: genfontconf.py
|
||||
@ -112,39 +111,21 @@ The google-noto-%subpkgname-fonts package contains %* fonts. \
|
||||
%notocjkpkg -n sans-cjk-jp -f NotoSansCJKjp-*.otf Japanese Multilingual Sans OTF
|
||||
|
||||
|
||||
%notocjkpkg -n serif-cjk-jp -f NotoSerifCJKjp-*.otf Japanese Multilingual Serif OTF
|
||||
|
||||
|
||||
%notocjkpkg -n sans-mono-cjk-jp -f NotoSansMonoCJKjp-*.otf Japanese Multilingual Sans Mono OTF
|
||||
|
||||
|
||||
%notocjkpkg -n sans-cjk-kr -f NotoSansCJKkr-*.otf Korean Multilingual Sans OTF
|
||||
|
||||
|
||||
%notocjkpkg -n serif-cjk-kr -f NotoSerifCJKkr-*.otf Korean Multilingual Serif OTF
|
||||
|
||||
|
||||
%notocjkpkg -n sans-mono-cjk-kr -f NotoSansMonoCJKkr-*.otf Korean Multilingual Sans Mono OTF
|
||||
|
||||
|
||||
%notocjkpkg -n sans-cjk-sc -f NotoSansCJKsc-*.otf Simplified Chinese Multilingual Sans OTF
|
||||
|
||||
|
||||
%notocjkpkg -n serif-cjk-sc -f NotoSerifCJKsc-*.otf Simplified Chinese Multilingual Serif OTF
|
||||
|
||||
|
||||
%notocjkpkg -n sans-mono-cjk-sc -f NotoSansMonoCJKsc-*.otf Simplified Chinese Multilingual Sans Mono OTF
|
||||
|
||||
|
||||
%notocjkpkg -n sans-cjk-tc -f NotoSansCJKtc-*.otf Traditional Chinese Multilingual Sans OTF
|
||||
|
||||
|
||||
%notocjkpkg -n serif-cjk-tc -f NotoSerifCJKtc-*.otf Traditional Chinese Multilingual Serif OTF
|
||||
|
||||
|
||||
%notocjkpkg -n sans-mono-cjk-tc -f NotoSansMonoCJKtc-*.otf Traditional Chinese Multilingual Sans Mono OTF
|
||||
|
||||
|
||||
%notocjkpkg -n sans-mono-cjk-hk -f NotoSansMonoCJKhk-*.otf Traditional Chinese Multilingual Sans Mono OTF
|
||||
|
||||
|
||||
%notocjkpkg -n sans-jp -f NotoSansJP-*.otf Japanese Region-specific Sans OTF
|
||||
|
||||
|
||||
@ -169,10 +150,13 @@ The google-noto-%subpkgname-fonts package contains %* fonts. \
|
||||
%notocjkpkg -n serif-tc -f NotoSerifTC-*.otf Traditional Chinese Region-specific Serif OTF
|
||||
|
||||
|
||||
%notocjkpkg -n sans-hk -f NotoSansHK-*.otf Traditional Chinese Region-specific Sans OTF
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -c
|
||||
|
||||
for zipfile in `ls %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE10} %{SOURCE11} %{SOURCE12}`;
|
||||
for zipfile in `ls %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE10} %{SOURCE12}`;
|
||||
do unzip -j $zipfile -x LICENSE;
|
||||
done
|
||||
|
||||
@ -193,12 +177,11 @@ install -m 0644 -p NotoSansCJK-*.ttc %{buildroot}%{_fontdir}
|
||||
install -m 0644 -p NotoSerifCJK-*.ttc %{buildroot}%{_fontdir}
|
||||
|
||||
# copy Multilingual OTF files
|
||||
install -m 0644 -p NotoSansCJK{jp,kr,sc,tc}-*.otf %{buildroot}%{_fontdir}
|
||||
install -m 0644 -p NotoSerifCJK{jp,kr,sc,tc}-*.otf %{buildroot}%{_fontdir}
|
||||
install -m 0644 -p NotoSansMonoCJK{jp,kr,sc,tc}-*.otf %{buildroot}%{_fontdir}
|
||||
install -m 0644 -p NotoSansCJKjp-*.otf %{buildroot}%{_fontdir}
|
||||
install -m 0644 -p NotoSansMonoCJK{jp,kr,sc,tc,hk}-*.otf %{buildroot}%{_fontdir}
|
||||
|
||||
# copy Region-specific OTF
|
||||
install -m 0644 -p NotoSans{JP,KR,SC,TC}-*.otf %{buildroot}%{_fontdir}
|
||||
install -m 0644 -p NotoSans{JP,KR,SC,TC,HK}-*.otf %{buildroot}%{_fontdir}
|
||||
install -m 0644 -p NotoSerif{JP,KR,SC,TC}-*.otf %{buildroot}%{_fontdir}
|
||||
|
||||
|
||||
@ -206,14 +189,16 @@ install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
|
||||
%{buildroot}%{_fontconfig_confdir}
|
||||
|
||||
for f in sans-cjk-ttc serif-cjk-ttc \
|
||||
sans-cjk-jp serif-cjk-jp sans-mono-cjk-jp \
|
||||
sans-cjk-kr serif-cjk-kr sans-mono-cjk-kr \
|
||||
sans-cjk-sc serif-cjk-sc sans-mono-cjk-sc \
|
||||
sans-cjk-tc serif-cjk-tc sans-mono-cjk-tc \
|
||||
sans-cjk-jp sans-mono-cjk-jp \
|
||||
sans-mono-cjk-kr \
|
||||
sans-mono-cjk-sc \
|
||||
sans-mono-cjk-tc \
|
||||
sans-mono-cjk-hk \
|
||||
sans-jp serif-jp \
|
||||
sans-kr serif-kr \
|
||||
sans-sc serif-sc \
|
||||
sans-tc serif-tc;
|
||||
sans-tc serif-tc \
|
||||
sans-hk;
|
||||
do
|
||||
fconf=$(basename -a *-%{fontconf}-$f.conf)
|
||||
if [ "$(echo $fconf | wc -w)" -ne 1 ]; then
|
||||
@ -246,17 +231,54 @@ ln -s %{_fontconfig_templatedir}/%{fontconf2} \
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Nov 23 2023 Peng Wu <pwu@redhat.com> - 20230817-2
|
||||
- Add google-noto-sans-cjk-jp-fonts back
|
||||
- Resolves: RHEL-13738
|
||||
|
||||
* Thu Nov 2 2023 Peng Wu <pwu@redhat.com> - 20230817-1
|
||||
- Update Noto CJK to Sans 2.004 and Serif 2.002
|
||||
- Resolves: RHEL-29145
|
||||
- Drop some Noto CJK Language Specific OTFs sub packages
|
||||
- Resolves: RHEL-13738
|
||||
|
||||
* Wed May 8 2019 Peng Wu <pwu@redhat.com> - 20190416-1
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 20201206-4
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 20201206-3
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20201206-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Mon Jan 18 2021 Peng Wu <pwu@redhat.com> - 20201206-1
|
||||
- Update to v20201206
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20190416-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20190416-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Tue Aug 13 2019 Peng Wu <pwu@redhat.com> - 20190416-5
|
||||
- Update 65-google-noto-cjk-fonts.conf for HK
|
||||
|
||||
* Thu Aug 1 2019 Peng Wu <pwu@redhat.com> - 20190416-4
|
||||
- Correct lang property of fontconfig in Noto Sans CJK fonts
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20190416-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Tue May 14 2019 Peng Wu <pwu@redhat.com> - 20190416-2
|
||||
- Include HongKong fonts
|
||||
|
||||
* Wed Apr 17 2019 Peng Wu <pwu@redhat.com> - 20190416-1
|
||||
- Update to git commit be6c059
|
||||
- Resolves: #1702408
|
||||
|
||||
* Tue Sep 4 2018 Peng Wu <pwu@redhat.com> - 20170602-9
|
||||
- Add BuildRequires python3-devel
|
||||
- Resolves: #1624469
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20170602-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Fri Dec 14 2018 Peng Wu <pwu@redhat.com> - 20170602-9
|
||||
- Support Macau locale
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 20170602-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
@ -1,2 +0,0 @@
|
||||
role_pkgs_req:
|
||||
- rsync
|
@ -1,4 +0,0 @@
|
||||
---
|
||||
|
||||
dependencies:
|
||||
- role: str-common-init
|
@ -1,87 +0,0 @@
|
||||
---
|
||||
- name: Check if fontconfig is installed
|
||||
register: fontconfig_testing_runner
|
||||
find:
|
||||
paths: "{{ ansible_env.PATH.split(':') }}"
|
||||
pattern: fc-validate
|
||||
|
||||
- name: Install fontconfig
|
||||
when: fontconfig_testing_runner.matched == 0
|
||||
block:
|
||||
- name: Installing fontconfig
|
||||
package:
|
||||
name:
|
||||
- fontconfig
|
||||
|
||||
- name: Start fontconfig tests
|
||||
block:
|
||||
- name: Execute tests
|
||||
shell: |
|
||||
set -e
|
||||
log_file="{{ remote_artifacts }}/{{ installed_test_name }}.log"
|
||||
exec 2>>$log_file 1>>$log_file
|
||||
echo "Starting fontconfig tests"
|
||||
TEST=google-noto-sans-cjk-ttc-fonts
|
||||
status="FAIL"
|
||||
fc-validate -l jp /usr/share/fonts/google-noto-cjk/NotoSansCJK-*.ttc
|
||||
if [ $? -eq 0 ]; then
|
||||
status="PASS"
|
||||
fi
|
||||
echo "${status} $TEST JP" >> {{ remote_artifacts }}/test.log
|
||||
status="FAIL"
|
||||
fc-validate -l kr /usr/share/fonts/google-noto-cjk/NotoSansCJK-*.ttc
|
||||
if [ $? -eq 0 ]; then
|
||||
status="PASS"
|
||||
fi
|
||||
echo "${status} $TEST KR" >> {{ remote_artifacts }}/test.log
|
||||
status="FAIL"
|
||||
fc-validate -l zh_cn /usr/share/fonts/google-noto-cjk/NotoSansCJK-*.ttc
|
||||
if [ $? -eq 0 ]; then
|
||||
status="PASS"
|
||||
fi
|
||||
echo "${status} $TEST SC" >> {{ remote_artifacts }}/test.log
|
||||
status="FAIL"
|
||||
fc-validate -l zh_tw /usr/share/fonts/google-noto-cjk/NotoSansCJK-*.ttc
|
||||
if [ $? -eq 0 ]; then
|
||||
status="PASS"
|
||||
fi
|
||||
echo "${status} $TEST TC" >> {{ remote_artifacts }}/test.log
|
||||
TEST=google-noto-serif-cjk-ttc-fonts
|
||||
status="FAIL"
|
||||
fc-validate -l jp /usr/share/fonts/google-noto-cjk/NotoSerifCJK-*.ttc
|
||||
if [ $? -eq 0 ]; then
|
||||
status="PASS"
|
||||
fi
|
||||
echo "${status} $TEST JP" >> {{ remote_artifacts }}/test.log
|
||||
status="FAIL"
|
||||
fc-validate -l kr /usr/share/fonts/google-noto-cjk/NotoSerifCJK-*.ttc
|
||||
if [ $? -eq 0 ]; then
|
||||
status="PASS"
|
||||
fi
|
||||
echo "${status} $TEST KR" >> {{ remote_artifacts }}/test.log
|
||||
status="FAIL"
|
||||
fc-validate -l zh_cn /usr/share/fonts/google-noto-cjk/NotoSerifCJK-*.ttc
|
||||
if [ $? -eq 0 ]; then
|
||||
status="PASS"
|
||||
fi
|
||||
echo "${status} $TEST SC" >> {{ remote_artifacts }}/test.log
|
||||
status="FAIL"
|
||||
fc-validate -l zh_tw /usr/share/fonts/google-noto-cjk/NotoSerifCJK-*.ttc
|
||||
if [ $? -eq 0 ]; then
|
||||
status="PASS"
|
||||
fi
|
||||
echo "${status} $TEST TC" >> {{ remote_artifacts }}/test.log
|
||||
|
||||
- name: Check the results
|
||||
shell: grep "^FAIL" {{ remote_artifacts }}/test.log
|
||||
register: test_fails
|
||||
failed_when: False
|
||||
|
||||
- name: Set role result
|
||||
set_fact:
|
||||
role_result_failed: "{{ (test_fails.stdout|d|length > 0) or (test_fails.stderr|d|length > 0) }}"
|
||||
role_result_msg: "{{ test_fails.stdout|d('tests failed.') }}"
|
||||
|
||||
- include_role:
|
||||
name: str-common-final
|
||||
|
Loading…
Reference in New Issue
Block a user