diff --git a/.gitignore b/.gitignore index 9ac81be..5b8381c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,16 @@ /v1.004.tar.gz /noto-cjk-32a5844.tar.gz +/be6c059ac1587e556e2412b27f5155c8eb3ddbe6.tar.gz /noto-cjk-be6c059.tar.gz +/noto-cjk-782eab5.tar.gz +/03_NotoSansCJK-OTC.zip +/04_NotoSansCJK-OTF.zip +/04_NotoSerifCJKOTC.zip +/05_NotoSansCJK-SubsetOTF.zip +/05_NotoSerifCJKOTF.zip +/06_NotoSerifCJKSubsetOTF.zip +/11_NotoSansMonoCJKjp.zip +/12_NotoSansMonoCJKkr.zip +/13_NotoSansMonoCJKsc.zip +/14_NotoSansMonoCJKtc.zip +/15_NotoSansMonoCJKhk.zip diff --git a/65-google-noto-cjk-fonts.conf b/65-google-noto-cjk-fonts.conf new file mode 100644 index 0000000..e74c3b2 --- /dev/null +++ b/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/README.md b/README.md new file mode 100644 index 0000000..fda321a --- /dev/null +++ b/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/google-noto-cjk-fonts.spec b/google-noto-cjk-fonts.spec index 95c9f6d..e7b2660 100644 --- a/google-noto-cjk-fonts.spec +++ b/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 diff --git a/sources b/sources index ac139d4..c14753a 100644 --- a/sources +++ b/sources @@ -1 +1,11 @@ -SHA512 (noto-cjk-be6c059.tar.gz) = 8abebae9412622f50adb0f755621d97002233d8db367f8fc38dda6a0828c3ea879e9ac780a3b09239b0570ada1091b0a7889bb7301a9486da9dfdca7200e50da +SHA512 (03_NotoSansCJK-OTC.zip) = 3ab2f5f8a6437885ef5f1948aaa0fbbd4cbba2205c20869baaa680bb54641d32e38e7dce7eae07c3ebc1e3fcf7095fa5c23db557a473b4cf63efc7ac18a64b4a +SHA512 (04_NotoSansCJK-OTF.zip) = 17bc6d076d0d731ce8bcdf050be677bc6b4837d0b70275ea640fe070af6e948e3debae93ac5cd85c7607ff1da4449a4c29dc1aec9d4c725dec81a745490a54bb +SHA512 (04_NotoSerifCJKOTC.zip) = 8eba2d4805e974e7d7137f95c5d2ea08374f7faa34275d89315a4bebb93fde34bf157f7cf2be077f7349f908f129d5ec297a9798f8a99de244dca73b60ce0682 +SHA512 (05_NotoSansCJK-SubsetOTF.zip) = 39b7cd07c96ac1d3f716bdde1e88819b31956aa3fc49fc808eb0fa92b3ed9d49fa253d333993c2c866b99f8b08fd73bf0e04d143cbd957ac922736ba087c47de +SHA512 (05_NotoSerifCJKOTF.zip) = 368d3a7b27cbf7f2f29e19ff42ebb60b4e6b39b51880224bd76b8c79b10a5fd7cfb69a5d3b5c629f87390bd137c9ac4f3b25d90166517f9d96b29a4847dfc0c5 +SHA512 (06_NotoSerifCJKSubsetOTF.zip) = 7041307211d3ac523fb65d97f7ba3b8285c4e778ef207fa9777f8991a18310d72db549a2b7a8c411728368e040919e1727b47be9d098d707bb84686f6d4aa21b +SHA512 (11_NotoSansMonoCJKjp.zip) = b4cb166ec28a06237dc4aaf0e6fc2a47380c3c0b32c005d69d36c4fac6eb6bddac8f80e9729ef202ee5787682bab534e4db88aea27cc4d951d7add368a2248d3 +SHA512 (12_NotoSansMonoCJKkr.zip) = 7462cfbab25ab741735e874b10d9e4b04d92f3a4f4b98daaf4dccbe8341d51db7524bb2757a813045109bdff53dee520247f0ffa501b7148f032712a2e20dae0 +SHA512 (13_NotoSansMonoCJKsc.zip) = 3c501aab12522b608ffbe002eff2451bf30501637138e257ce4e924c644372c0d7348ae5b340ff085889c741df0adca53d3e5c999793498bedbfe578deda833a +SHA512 (14_NotoSansMonoCJKtc.zip) = e418d5e551d3390295843e410cb76b402ce0126e08869e36015c35fb3997e280d4f63122cd843d7f14df8f3680df020d645269f97463cb1a0c33b360ab3edd9d +SHA512 (15_NotoSansMonoCJKhk.zip) = 98bf37b26b1654bcd653431ea34b7c8e77820d3c237803087b54a84dbb0bd8f494179752ff991ad36198de3077202e6c1ed92a484929cfa987730696763c0691