diff --git a/google-noto-emoji-fonts.spec b/google-noto-emoji-fonts.spec index 8757c20..2890e78 100644 --- a/google-noto-emoji-fonts.spec +++ b/google-noto-emoji-fonts.spec @@ -9,7 +9,7 @@ Name: %{fontname}-fonts Version: 20170928 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Google “Noto Emoji” Black-and-White emoji font # In noto-emoji-fonts source @@ -23,7 +23,6 @@ Summary: Google “Noto Emoji” Black-and-White emoji font License: OFL and ASL 2.0 URL: https://github.com/googlei18n/noto-emoji Source0: https://github.com/googlei18n/noto-emoji/archive/%{commit0}.tar.gz#/noto-emoji-%{shortcommit0}.tar.gz -Source1: https://github.com/googlei18n/nototools/archive/%{commit1}.tar.gz#/nototools-%{shortcommit1}.tar.gz Source2: %{fontname}.metainfo.xml Source3: %{fontname}-color.metainfo.xml @@ -32,6 +31,8 @@ Patch0: noto-emoji-use-system-pngquant.patch BuildArch: noarch BuildRequires: fonttools BuildRequires: python2-fonttools +BuildRequires: nototools +BuildRequires: python2-nototools BuildRequires: python-devel BuildRequires: fontpackages-devel BuildRequires: ImageMagick @@ -60,18 +61,11 @@ This package provides the Google “Noto Color Emoji” colored emoji font. %autosetup -n noto-emoji-%{commit0} rm -rf third_party/pngquant -tar zxf %{SOURCE1} -rm -rf nototools-%{commit1}/third_party/{cldr,dspl,fontcrunch,ohchr,spiro,udhr,unicode} %build # Work around UTF-8 export LANG=C.UTF-8 -pushd nototools-%{commit1} -export PATH=$PATH:"$PWD/nototools" -export PYTHONPATH=$PWD -popd - make %{?_smp_mflags} OPT_CFLAGS="$RPM_OPT_FLAGS" %install @@ -99,6 +93,9 @@ install -m 0644 -p %{SOURCE3} %{buildroot}%{_datadir}/appdata %changelog +* Mon Feb 5 2018 Peng Wu - 20170928-3 +- Use nototools package to build google-noto-emoji-fonts + * Wed Nov 8 2017 Peter Oliver - 20170928-2 - Prefer zopflipng to optipng, since it should yield smaller files. - Use the font we built, rather than the one included with the source. diff --git a/sources b/sources index 57b924c..6e2abc0 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (nototools-0c99dff.tar.gz) = 857517142f95eb48029849e56c5f50ebf9827afed297c873fbab41500ea13dda98ffaf916f5e61a2ab764202c6724880d0f67b214707614918ddee243acea66c SHA512 (noto-emoji-411334c.tar.gz) = 2b21bf329766e0e4dd1a0817000af6de82e3485da74f1899c6b7d98bad69a8b573aef4437a4837fa25a98235df3d11ebae2a7fc2c7c03ce88b56f572ef310f4d