From 934cc4ed6d2d0e108c64892d2bc493edfdd61b8a Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Thu, 23 Feb 2017 16:06:02 +0800 Subject: [PATCH] Update to upstream snapshot tarball --- .gitignore | 2 ++ google-noto-emoji-fonts.spec | 11 +++++++---- noto-emoji-use-system-pngquant.patch | 2 +- sources | 4 ++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 390dcab..24091a8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /noto-emoji-e7a7241.tar.gz /nototools-c1f2cff.tar.gz +/noto-emoji-1c0ce22.tar.gz +/nototools-d59a186.tar.gz diff --git a/google-noto-emoji-fonts.spec b/google-noto-emoji-fonts.spec index 1c65804..e0423d1 100644 --- a/google-noto-emoji-fonts.spec +++ b/google-noto-emoji-fonts.spec @@ -1,15 +1,15 @@ -%global commit0 e7a7241a929625feb16920a40bfa29e4a302b82b +%global commit0 1c0ce222a4827d11501297f3c303f84cc3a45cad %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global commit1 c1f2cffbba35d08c9558006bc7860492ce322b87 +%global commit1 d59a1867d3adc3e7ae94f1b4facecb9bf2a30089 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) %global fontname google-noto-emoji Name: google-noto-emoji-fonts -Version: 20160406 -Release: 6%{?dist} +Version: 20170223 +Release: 1%{?dist} Summary: Google Noto Emoji Fonts # In noto-emoji-fonts source @@ -81,6 +81,9 @@ install -m 0644 -p %{SOURCE2} %{buildroot}%{_datadir}/appdata %changelog +* Thu Feb 23 2017 Peng Wu - 20170223-1 +- Update to upstream snapshot tarball + * Fri Feb 10 2017 Fedora Release Engineering - 20160406-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/noto-emoji-use-system-pngquant.patch b/noto-emoji-use-system-pngquant.patch index cd9b0d9..99cbd92 100644 --- a/noto-emoji-use-system-pngquant.patch +++ b/noto-emoji-use-system-pngquant.patch @@ -8,7 +8,7 @@ Index: noto-emoji-e7a7241a929625feb16920a40bfa29e4a302b82b/Makefile -CFLAGS = -std=c99 -Wall -Wextra `pkg-config --cflags --libs cairo` +CFLAGS = $(OPT_CFLAGS) `pkg-config --cflags --libs cairo` - LDFLAGS = `pkg-config --libs cairo` + LDFLAGS = -lm `pkg-config --libs cairo` -PNGQUANTDIR := third_party/pngquant -PNGQUANT := $(PNGQUANTDIR)/pngquant +PNGQUANT = pngquant diff --git a/sources b/sources index d8a4c16..8c98f9a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -81d49583099229ee568e3dad9da6c17a noto-emoji-e7a7241.tar.gz -4b27c82986d6c9ec42c976341cbe85d3 nototools-c1f2cff.tar.gz +SHA512 (noto-emoji-1c0ce22.tar.gz) = 06e5913d5f30e24d184d2bfb405d24fc7c85a02669e067abd381cc900d0968145815277f1bfd95ce3977a3f99524c64d4d74c70cfea42c275a7c7073217d99f0 +SHA512 (nototools-d59a186.tar.gz) = 166db06d36b32e16396adde1be6a47f48d3340773cbb47a2e2a86f3bbedb51ed9023c213a75bbeab749e9e815c875337bf1542f358a43e5e6104a2dac16e8925