diff --git a/.gitignore b/.gitignore index 6e250c1..c052c01 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,11 @@ -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/05_NotoSerifCJKOTF.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 diff --git a/.google-noto-cjk-fonts.metadata b/.google-noto-cjk-fonts.metadata index fb26ee2..d6d6c61 100644 --- a/.google-noto-cjk-fonts.metadata +++ b/.google-noto-cjk-fonts.metadata @@ -1 +1,11 @@ -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 +73dd1d34ffa162a7f5773231d134cb9862ef8e23 SOURCES/05_NotoSerifCJKOTF.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 diff --git a/SOURCES/65-google-noto-cjk-fonts.conf b/SOURCES/65-google-noto-cjk-fonts.conf new file mode 100644 index 0000000..e74c3b2 --- /dev/null +++ b/SOURCES/65-google-noto-cjk-fonts.conf @@ -0,0 +1,92 @@ + + + + + + Noto Sans CJK SC + + + + lang + + ja + ko + zh-hk + zh-mo + zh-tw + + + + + + + Noto Sans CJK TC + + + + lang + + ja + ko + zh-cn + zh-hk + zh-mo + zh-sg + + + + + + + Noto Sans CJK HK + + + + lang + + ja + ko + zh-cn + zh-sg + zh-tw + + + + + + + Noto Sans CJK JP + + + + lang + + ko + zh-cn + zh-hk + zh-mo + zh-sg + zh-tw + + + + + + + Noto Sans CJK KR + + + + lang + + ja + zh-cn + zh-hk + zh-mo + zh-sg + zh-tw + + + + + diff --git a/SOURCES/README.md b/SOURCES/README.md new file mode 100644 index 0000000..fda321a --- /dev/null +++ b/SOURCES/README.md @@ -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* diff --git a/SPECS/google-noto-cjk-fonts.spec b/SPECS/google-noto-cjk-fonts.spec index 95c9f6d..e7b2660 100644 --- a/SPECS/google-noto-cjk-fonts.spec +++ b/SPECS/google-noto-cjk-fonts.spec @@ -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,34 @@ supported for compatibility with CJK standards. \ %{nil} Name: google-noto-cjk-fonts -Version: 20190416 +Version: 20230817 Release: 1%{?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 +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 +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 @@ -154,11 +170,17 @@ The google-noto-%subpkgname-fonts package contains %* fonts. \ %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} %{SOURCE11} %{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 @@ -206,15 +228,28 @@ 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 +* Thu Nov 2 2023 Peng Wu - 20230817-1 +- Update Noto CJK to Sans 2.004 and Serif 2.002 +- Resolves: RHEL-29145 + * Wed May 8 2019 Peng Wu - 20190416-1 - Update to git commit be6c059 - Resolves: #1702408