From 921ccf1ff7b72f6f06d331e0fb6123f7721aa1e7 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 28 Mar 2024 10:29:05 +0000 Subject: [PATCH] import CS google-noto-cjk-fonts-20230817-2.el9 --- .gitignore | 11 +++- .google-noto-cjk-fonts.metadata | 11 +++- SOURCES/README.md | 13 +++++ SOURCES/genfontconf.sh | 27 ++-------- SPECS/google-noto-cjk-fonts.spec | 91 +++++++++++++++++--------------- 5 files changed, 85 insertions(+), 68 deletions(-) create mode 100644 SOURCES/README.md diff --git a/.gitignore b/.gitignore index 2d9f860..3b599a8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,10 @@ -SOURCES/noto-cjk-782eab5.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 diff --git a/.google-noto-cjk-fonts.metadata b/.google-noto-cjk-fonts.metadata index 5e2ed78..570d515 100644 --- a/.google-noto-cjk-fonts.metadata +++ b/.google-noto-cjk-fonts.metadata @@ -1 +1,10 @@ -55fdb400492be336a93381dda4f6e7d55a58cb7a SOURCES/noto-cjk-782eab5.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 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/SOURCES/genfontconf.sh b/SOURCES/genfontconf.sh index e5a291e..2de23ac 100644 --- a/SOURCES/genfontconf.sh +++ b/SOURCES/genfontconf.sh @@ -20,37 +20,20 @@ python3 genfontconf.py "ja" "serif" "Noto Serif CJK JP" \ "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-mo" "sans-serif" "Noto Sans CJK TC" | xmllint --format - |tee 66-google-noto-sans-cjk-tc.conf - -python3 genfontconf.py "zh-tw:zh-hk:zh-mo" "serif" "Noto Serif CJK TC" | xmllint --format - |tee 66-google-noto-serif-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 -# Generate for google-noto-sans-cjk-hk-fonts and google-noto-sans-mono-cjk-hk-fonts -python3 genfontconf.py "zh-hk" "sans-serif" "Noto Sans CJK HK" | xmllint --format - |tee 66-google-noto-sans-cjk-hk.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 diff --git a/SPECS/google-noto-cjk-fonts.spec b/SPECS/google-noto-cjk-fonts.spec index 2fbbcf8..25b4b96 100644 --- a/SPECS/google-noto-cjk-fonts.spec +++ b/SPECS/google-noto-cjk-fonts.spec @@ -1,5 +1,5 @@ -%global commit0 782eab531e724779772302b835661b7b12a6b3a8 -%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 @@ -13,16 +13,29 @@ supported for compatibility with CJK standards. \ %{nil} Name: google-noto-cjk-fonts -Version: 20201206 -Release: 4%{?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 -Source3: %{fontconf2} +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 @@ -98,42 +111,18 @@ 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-cjk-hk -f NotoSansCJKhk-*.otf Traditional Chinese Multilingual Sans OTF - - %notocjkpkg -n sans-mono-cjk-hk -f NotoSansMonoCJKhk-*.otf Traditional Chinese Multilingual Sans Mono OTF @@ -165,11 +154,17 @@ The google-noto-%subpkgname-fonts package contains %* fonts. \ %prep -%setup -q -n noto-cjk-%{version}-cjk -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 @@ -182,8 +177,7 @@ 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,hk}-*.otf %{buildroot}%{_fontdir} -install -m 0644 -p NotoSerifCJK{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 @@ -195,11 +189,11 @@ 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-hk sans-mono-cjk-hk \ + 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 \ @@ -219,7 +213,7 @@ do %{buildroot}%{_fontconfig_confdir}/${fconf} done -install -m 0644 -p %{SOURCE3} \ +install -m 0644 -p %{SOURCE23} \ %{buildroot}%{_fontconfig_templatedir}/%{fontconf2} ln -s %{_fontconfig_templatedir}/%{fontconf2} \ @@ -230,13 +224,22 @@ ln -s %{_fontconfig_templatedir}/%{fontconf2} \ %files common -%doc NEWS.md HISTORY.md README-formats.md README-third_party.md +%doc README.md %license LICENSE %{_fontconfig_templatedir}/%{fontconf2} %config(noreplace) %{_fontconfig_confdir}/%{fontconf2} %changelog +* Thu Nov 23 2023 Peng Wu - 20230817-2 +- Add google-noto-sans-cjk-jp-fonts back +- Resolves: RHEL-13738 + +* Thu Nov 2 2023 Peng Wu - 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 - 20201206-4 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688