Compare commits

...

No commits in common. "c8s" and "c9-beta" have entirely different histories.
c8s ... c9-beta

6 changed files with 258 additions and 73 deletions

11
.gitignore vendored
View File

@ -1 +1,10 @@
SOURCES/noto-cjk-be6c059.tar.gz
SOURCES/03_NotoSansCJK-OTC.zip
SOURCES/04_NotoSansCJK-OTF.zip
SOURCES/04_NotoSerifCJKOTC.zip
SOURCES/05_NotoSansCJK-SubsetOTF.zip
SOURCES/06_NotoSerifCJKSubsetOTF.zip
SOURCES/11_NotoSansMonoCJKjp.zip
SOURCES/12_NotoSansMonoCJKkr.zip
SOURCES/13_NotoSansMonoCJKsc.zip
SOURCES/14_NotoSansMonoCJKtc.zip
SOURCES/15_NotoSansMonoCJKhk.zip

View File

@ -1 +1,10 @@
c3bd01902fc238e858d537dd45ae379b5dac62cd SOURCES/noto-cjk-be6c059.tar.gz
b035fa3027f99bc2c7e864ee6f28d420742d82e8 SOURCES/03_NotoSansCJK-OTC.zip
f379ef418c658b13c9bc8da7a9479bceb95ca075 SOURCES/04_NotoSansCJK-OTF.zip
655a4c385d7eab8413c4ccb2560f379a6c878770 SOURCES/04_NotoSerifCJKOTC.zip
cbf3a6076d2b8bbc70c40608c4bf19385cf39fdb SOURCES/05_NotoSansCJK-SubsetOTF.zip
d308894302e774033da1d03ebc9387708d8ed521 SOURCES/06_NotoSerifCJKSubsetOTF.zip
106ec5dc37769f27725046559dee0ef7cb1746c5 SOURCES/11_NotoSansMonoCJKjp.zip
c2ebbf7db6b99d6da8623a81a9b98d9cbc51e02b SOURCES/12_NotoSansMonoCJKkr.zip
b8abacdc81415736b6d004d6c25c897513f51246 SOURCES/13_NotoSansMonoCJKsc.zip
1320283bc58c8a20bc351f8e77a761d6b582cae1 SOURCES/14_NotoSansMonoCJKtc.zip
0994e8134545878cead7101d6f76dda0a871ea4e SOURCES/15_NotoSansMonoCJKhk.zip

View File

@ -0,0 +1,92 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<match target="scan">
<test name="family">
<string>Noto Sans CJK SC</string>
</test>
<edit name="lang" mode="assign">
<minus>
<name>lang</name>
<langset>
<string>ja</string>
<string>ko</string>
<string>zh-hk</string>
<string>zh-mo</string>
<string>zh-tw</string>
</langset>
</minus>
</edit>
</match>
<match target="scan">
<test name="family">
<string>Noto Sans CJK TC</string>
</test>
<edit name="lang" mode="assign">
<minus>
<name>lang</name>
<langset>
<string>ja</string>
<string>ko</string>
<string>zh-cn</string>
<string>zh-hk</string>
<string>zh-mo</string>
<string>zh-sg</string>
</langset>
</minus>
</edit>
</match>
<match target="scan">
<test name="family">
<string>Noto Sans CJK HK</string>
</test>
<edit name="lang" mode="assign">
<minus>
<name>lang</name>
<langset>
<string>ja</string>
<string>ko</string>
<string>zh-cn</string>
<string>zh-sg</string>
<string>zh-tw</string>
</langset>
</minus>
</edit>
</match>
<match target="scan">
<test name="family">
<string>Noto Sans CJK JP</string>
</test>
<edit name="lang" mode="assign">
<minus>
<name>lang</name>
<langset>
<string>ko</string>
<string>zh-cn</string>
<string>zh-hk</string>
<string>zh-mo</string>
<string>zh-sg</string>
<string>zh-tw</string>
</langset>
</minus>
</edit>
</match>
<match target="scan">
<test name="family">
<string>Noto Sans CJK KR</string>
</test>
<edit name="lang" mode="assign">
<minus>
<name>lang</name>
<langset>
<string>ja</string>
<string>zh-cn</string>
<string>zh-hk</string>
<string>zh-mo</string>
<string>zh-sg</string>
<string>zh-tw</string>
</langset>
</minus>
</edit>
</match>
</fontconfig>

13
SOURCES/README.md Normal file
View File

@ -0,0 +1,13 @@
# Noto CJK fonts
Download individual fonts from the download guides for [Noto Sans CJK](https://github.com/googlefonts/noto-cjk/tree/main/Sans#downloading-noto-sans-cjk) or [Noto Serif CJK](https://github.com/googlefonts/noto-cjk/tree/main/Serif#downloading-noto-serif-cjk) or look in [Releases](https://github.com/googlefonts/noto-cjk/releases)
Release notes and version history are documented separately for [Sans](https://github.com/googlefonts/noto-cjk/blob/main/Sans/NEWS.md#noto-sans-cjk-release-notes) and [Serif](https://github.com/googlefonts/noto-cjk/blob/main/Serif/NEWS.md#noto-serif-cjk-release-notes)
Noto CJK fonts are also available on [Google Fonts](https://fonts.google.com/noto/fonts) but under different names than in this repository. The two letter code here is replaced at Google Fonts as follows:
- *JP* -> *Japanese*
- *KR* -> *Korean*
- *SC* -> *Simplified Chinese*
- *TC* -> *Traditional Chinese*
- *HK* -> *Hong Kong*

View File

@ -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

View File

@ -1,8 +1,9 @@
%global commit0 be6c059ac1587e556e2412b27f5155c8eb3ddbe6
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global sans_version 2.004
%global serif_version 2.002
%global fontname google-noto-cjk
%global fontconf google-noto
%global fontconf2 65-%{fontconf}-cjk-fonts.conf
%global common_desc \
Noto CJK fonts, supporting Simplified Chinese, Traditional Chinese, \
@ -12,19 +13,33 @@ supported for compatibility with CJK standards. \
%{nil}
Name: google-noto-cjk-fonts
Version: 20190416
Release: 1%{?dist}
Version: 20230817
Release: 2%{?dist}
Summary: Google Noto Sans CJK Fonts
License: OFL
URL: https://github.com/googlei18n/noto-cjk
Source0: https://github.com/googlei18n/noto-cjk/archive/%{commit0}.tar.gz#/noto-cjk-%{shortcommit0}.tar.gz
Source1: genfontconf.py
Source2: genfontconf.sh
URL: https://github.com/notofonts/noto-cjk
Source0: https://github.com/notofonts/noto-cjk/releases/download/Sans%{sans_version}/03_NotoSansCJK-OTC.zip
Source1: https://github.com/notofonts/noto-cjk/releases/download/Sans%{sans_version}/04_NotoSansCJK-OTF.zip
Source2: https://github.com/notofonts/noto-cjk/releases/download/Sans%{sans_version}/05_NotoSansCJK-SubsetOTF.zip
Source3: https://github.com/notofonts/noto-cjk/releases/download/Sans%{sans_version}/11_NotoSansMonoCJKjp.zip
Source4: https://github.com/notofonts/noto-cjk/releases/download/Sans%{sans_version}/12_NotoSansMonoCJKkr.zip
Source5: https://github.com/notofonts/noto-cjk/releases/download/Sans%{sans_version}/13_NotoSansMonoCJKsc.zip
Source6: https://github.com/notofonts/noto-cjk/releases/download/Sans%{sans_version}/14_NotoSansMonoCJKtc.zip
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
Source12: https://github.com/notofonts/noto-cjk/releases/download/Serif%{serif_version}/06_NotoSerifCJKSubsetOTF.zip
Source21: genfontconf.py
Source22: genfontconf.sh
Source23: %{fontconf2}
Source30: README.md
BuildArch: noarch
BuildRequires: fontpackages-devel
BuildRequires: python3-devel
BuildRequires: python3
BuildRequires: /usr/bin/xmllint
Requires: fontpackages-filesystem
Requires: google-noto-sans-cjk-ttc-fonts
@ -96,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
@ -153,12 +150,21 @@ 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 -n noto-cjk-%{commit0}
cp -p %{SOURCE1} %{SOURCE2} .
%setup -q -c
for zipfile in `ls %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE10} %{SOURCE12}`;
do unzip -j $zipfile -x LICENSE;
done
cp -p %{SOURCE21} %{SOURCE22} .
# generate the font conf files
bash -x ./genfontconf.sh
cp -p %{SOURCE30} .
%build
@ -171,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}
@ -184,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
@ -206,22 +213,72 @@ do
%{buildroot}%{_fontconfig_confdir}/${fconf}
done
install -m 0644 -p %{SOURCE23} \
%{buildroot}%{_fontconfig_templatedir}/%{fontconf2}
ln -s %{_fontconfig_templatedir}/%{fontconf2} \
%{buildroot}%{_fontconfig_confdir}/%{fontconf2}
%files
%files common
%doc NEWS HISTORY README.formats README.third_party
%doc README.md
%license LICENSE
%{_fontconfig_templatedir}/%{fontconf2}
%config(noreplace) %{_fontconfig_confdir}/%{fontconf2}
%changelog
* Wed May 8 2019 Peng Wu <pwu@redhat.com> - 20190416-1
- Update to git commit be6c059
- Resolves: #1702408
* Thu Nov 23 2023 Peng Wu <pwu@redhat.com> - 20230817-2
- Add google-noto-sans-cjk-jp-fonts back
- Resolves: RHEL-13738
* Tue Sep 4 2018 Peng Wu <pwu@redhat.com> - 20170602-9
- Add BuildRequires python3-devel
- Resolves: #1624469
* Thu Nov 2 2023 Peng Wu <pwu@redhat.com> - 20230817-1
- Update Noto CJK to Sans 2.004 and Serif 2.002
- Drop some Noto CJK Language Specific OTFs sub packages
- Resolves: RHEL-13738
* 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
* 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