From a312c1626abbc7661ab03a372f367c8a51a9a5bb Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Mon, 18 Jan 2021 09:42:03 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/google-noto-cjk-fonts.git#ca202a620a1fa42b3a826688da290a12c7de45c4 --- .gitignore | 1 + google-noto-cjk-fonts.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index e479a5a..e33c513 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /noto-cjk-32a5844.tar.gz /be6c059ac1587e556e2412b27f5155c8eb3ddbe6.tar.gz /noto-cjk-be6c059.tar.gz +/noto-cjk-782eab5.tar.gz diff --git a/google-noto-cjk-fonts.spec b/google-noto-cjk-fonts.spec index da1be9e..f8dc8fa 100644 --- a/google-noto-cjk-fonts.spec +++ b/google-noto-cjk-fonts.spec @@ -1,4 +1,4 @@ -%global commit0 be6c059ac1587e556e2412b27f5155c8eb3ddbe6 +%global commit0 782eab531e724779772302b835661b7b12a6b3a8 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global fontname google-noto-cjk @@ -13,8 +13,8 @@ supported for compatibility with CJK standards. \ %{nil} Name: google-noto-cjk-fonts -Version: 20190416 -Release: 7%{?dist} +Version: 20201206 +Release: 1%{?dist} Summary: Google Noto Sans CJK Fonts License: OFL @@ -165,7 +165,7 @@ The google-noto-%subpkgname-fonts package contains %* fonts. \ %prep -%setup -q -n noto-cjk-%{commit0} +%setup -q -n noto-cjk-%{version}-cjk cp -p %{SOURCE1} %{SOURCE2} . # generate the font conf files bash -x ./genfontconf.sh @@ -230,13 +230,16 @@ ln -s %{_fontconfig_templatedir}/%{fontconf2} \ %files common -%doc NEWS HISTORY README.formats README.third_party +%doc NEWS.md HISTORY.md README-formats.md README-third_party.md %license LICENSE %{_fontconfig_templatedir}/%{fontconf2} %config(noreplace) %{_fontconfig_confdir}/%{fontconf2} %changelog +* Mon Jan 18 2021 Peng Wu - 20201206-1 +- Update to v20201206 + * Tue Jul 28 2020 Fedora Release Engineering - 20190416-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index ac139d4..1e92e4a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (noto-cjk-be6c059.tar.gz) = 8abebae9412622f50adb0f755621d97002233d8db367f8fc38dda6a0828c3ea879e9ac780a3b09239b0570ada1091b0a7889bb7301a9486da9dfdca7200e50da +SHA512 (noto-cjk-782eab5.tar.gz) = e2b77f3f6bcb1ee421cbf001d16832fff22b0b69a7c8ba2f14c8bf516fa9e358a963c3eb358603937522cd409cfc6fa67d1cf6c8be9ede16b237539e23fca445