diff --git a/genfontconf.sh b/genfontconf.sh index 1163c8e..2de23ac 100644 --- a/genfontconf.sh +++ b/genfontconf.sh @@ -20,7 +20,8 @@ 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-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" "monospace" "Noto Sans Mono CJK JP" | xmllint --format - |tee 66-google-noto-sans-mono-cjk-jp.conf # Generate for google-noto-sans-mono-cjk-kr-fonts diff --git a/google-noto-cjk-fonts.spec b/google-noto-cjk-fonts.spec index ce54d5e..25b4b96 100644 --- a/google-noto-cjk-fonts.spec +++ b/google-noto-cjk-fonts.spec @@ -14,12 +14,13 @@ 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 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 @@ -107,6 +108,9 @@ The google-noto-%subpkgname-fonts package contains %* fonts. \ %notocjkpkg -n serif-cjk-ttc -f NotoSerifCJK-*.ttc -p 65-0 Serif OTC +%notocjkpkg -n sans-cjk-jp -f NotoSansCJKjp-*.otf Japanese Multilingual Sans OTF + + %notocjkpkg -n sans-mono-cjk-jp -f NotoSansMonoCJKjp-*.otf Japanese Multilingual Sans Mono OTF @@ -152,7 +156,7 @@ The google-noto-%subpkgname-fonts package contains %* fonts. \ %prep %setup -q -c -for zipfile in `ls %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE10} %{SOURCE12}`; +for zipfile in `ls %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE10} %{SOURCE12}`; do unzip -j $zipfile -x LICENSE; done @@ -173,6 +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 NotoSansCJKjp-*.otf %{buildroot}%{_fontdir} install -m 0644 -p NotoSansMonoCJK{jp,kr,sc,tc,hk}-*.otf %{buildroot}%{_fontdir} # copy Region-specific OTF @@ -184,7 +189,7 @@ install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \ %{buildroot}%{_fontconfig_confdir} for f in sans-cjk-ttc serif-cjk-ttc \ - sans-mono-cjk-jp \ + sans-cjk-jp sans-mono-cjk-jp \ sans-mono-cjk-kr \ sans-mono-cjk-sc \ sans-mono-cjk-tc \ @@ -226,6 +231,10 @@ ln -s %{_fontconfig_templatedir}/%{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