.gitignore

@@ -1 +1 @@
-SOURCES/noto-emoji-9a5261d.tar.gz
+SOURCES/noto-emoji-aac7cca.tar.gz

.google-noto-emoji-fonts.metadata

@@ -1 +1 @@
-09fc7c375808a9d0bb190fe2101472ddc5064df4 SOURCES/noto-emoji-9a5261d.tar.gz
+5e6a809412c3947debe432adea4bbaf7310d8af4 SOURCES/noto-emoji-aac7cca.tar.gz

SOURCES/noto-emoji-use-system-pngquant.patch

@@ -1,10 +1,9 @@
-Index: noto-emoji-c05b4b47c8250ccd232780cae46d66a8179e77ab/Makefile
+diff -ru noto-emoji-d5e261484286d33a1fe8a02676f5907ecc02106f.orig/Makefile noto-emoji-d5e261484286d33a1fe8a02676f5907ecc02106f/Makefile
-===================================================================
+--- noto-emoji-d5e261484286d33a1fe8a02676f5907ecc02106f.orig/Makefile	2020-07-23 18:53:36.935321925 +0200
---- noto-emoji-c05b4b47c8250ccd232780cae46d66a8179e77ab.orig/Makefile
++++ noto-emoji-d5e261484286d33a1fe8a02676f5907ecc02106f/Makefile	2020-07-23 19:05:20.380141144 +0200
-+++ noto-emoji-c05b4b47c8250ccd232780cae46d66a8179e77ab/Makefile
+@@ -15,10 +15,10 @@
-@@ -16,10 +16,10 @@ EMOJI = NotoColorEmoji
+ EMOJI = NotoColorEmoji
- EMOJI_WINDOWS = NotoColorEmoji_WindowsCompatible
+ font: $(EMOJI).ttf
- all: $(EMOJI).ttf $(EMOJI_WINDOWS).ttf
  
 -CFLAGS = -std=c99 -Wall -Wextra `pkg-config --cflags --libs cairo`
 +CFLAGS = $(OPT_CFLAGS) -Wextra `pkg-config --cflags --libs cairo`
@@ -15,7 +14,7 @@ Index: noto-emoji-c05b4b47c8250ccd232780cae46d66a8179e77ab/Makefile
  PYTHON = python3
  PNGQUANTFLAGS = --speed 1 --skip-if-larger --quality 85-95 --force
  BODY_DIMENSIONS = 136x128
-@@ -88,9 +88,9 @@ ifeq (,$(shell which $(ZOPFLIPNG)))
+@@ -87,9 +87,9 @@
    endif
  endif
  

SPECS/google-noto-emoji-fonts.spec

@@ -1,4 +1,4 @@
-%global commit0 9a5261d871451f9b5183c93483cbd68ed916b1e9
+%global commit0 aac7ccaa4d1dea4543453b96f7d6fc47066a57ff
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 %global fontname google-noto-emoji
@@ -11,8 +11,8 @@
 
 
 Name:           %{fontname}-fonts
-Version:        20211102
+Version:        20200916
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Google “Noto Emoji” Black-and-White emoji font
 
 # In noto-emoji-fonts source
@@ -29,25 +29,23 @@ Source0:        https://github.com/googlei18n/noto-emoji/archive/%{commit0}.tar.
 Source2:        %{fontname}.metainfo.xml
 Source3:        %{fontname}-color.metainfo.xml
 
-Patch0:         noto-emoji-build-all-flags.patch
+Patch0:         noto-emoji-use-system-pngquant.patch
-Patch1:         noto-emoji-use-gm.patch
+Patch1:         noto-emoji-build-all-flags.patch
-Patch2:         noto-emoji-use-system-pngquant.patch
+Patch2:         noto-emoji-use-gm.patch
 
 BuildArch:      noarch
-BuildRequires:  gcc
 BuildRequires:  fontpackages-devel
 %if %buildfont
 BuildRequires:  fonttools
-BuildRequires:  python3-fonttools
+BuildRequires:  python2-fonttools
 BuildRequires:  nototools
-BuildRequires:  python3-nototools
+BuildRequires:  python2-nototools
-BuildRequires:  python3-devel
+BuildRequires:  python2-devel
 BuildRequires:  GraphicsMagick
 BuildRequires:  pngquant
 BuildRequires:  zopfli
 BuildRequires:  cairo-devel
 %endif
-BuildRequires: make
 
 Requires:       fontpackages-filesystem
 
@@ -67,10 +65,7 @@ Provides:       google-noto-color-emoji-fonts = 20150617
 This package provides the Google “Noto Color Emoji” colored emoji font.
 
 %prep
-%setup -n noto-emoji-%{commit0}
+%autosetup -n noto-emoji-%{commit0}
-%patch0 -p1 -b .noto-emoji-build-all-flags
-%patch1 -p1 -b .noto-emoji-use-gm.patch
-%patch2 -p1 -b .noto-emoji-use-system-pngquant
 
 rm -rf third_party/pngquant
 
@@ -79,7 +74,7 @@ rm -rf third_party/pngquant
 # Work around UTF-8
 export LANG=C.UTF-8
 
-%make_build OPT_CFLAGS="$RPM_OPT_FLAGS" BYPASS_SEQUENCE_CHECK='True'
+make %{?_smp_mflags} OPT_CFLAGS="$RPM_OPT_FLAGS"
 %endif
 
 %install
@@ -112,72 +107,19 @@ install -m 0644 -p %{SOURCE3} %{buildroot}%{_datadir}/appdata
 
 
 %changelog
-* Tue Nov  1 2022 Peng Wu <pwu@redhat.com> - 20211102-1
+* Tue May 25 2021 Peng Wu <pwu@redhat.com> - 20200916-2
-- Update to v2.034
+- Rebuild the package
-- Resolves: #2118299
+- Resolves: RHBZ#1897541
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 20200916-4
+* Tue May 25 2021 Peng Wu <pwu@redhat.com> - 20200916-1
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Update to Unicode 13.1.0 support
-  Related: rhbz#1991688
+- Resolves: RHBZ#1897541
 
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 20200916-3
+* Thu Jun 28 2018 Peng Wu <pwu@redhat.com> - 20180508-4
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Resolves: RHBZ#1591712
 
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20200916-2
+* Wed Jun 27 2018 Lumír Balhar <lbalhar@redhat.com> - 20180508-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+- Disable build of fonts and rather ship pre-built ones
-
-* Thu Dec 24 2020 Peng Wu <pwu@redhat.com> - 20200916-1
-- Update to upstream snapshot tarball (Unicode 13.1.0 support)
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20200723-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 21 2020 Mike FABIAN <mfabian@redhat.com> - 20200723-1
-- Update to upstream snapshot tarball (Unicode 13.0.0 support)
-
-* Mon Jul 13 2020 Tom Stellard <tstellar@redhat.com> - 20200402-2
-- Use make macros
-- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
-
-* Thu Apr 02 2020 Mike FABIAN <mfabian@redhat.com> - 20200402-1
-- Update to upstream snapshot tarball (fixes U+1F9D1 U+200D U+1F3A8 "artist"
-  and many other sequences)
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20191019-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Oct 19 2019 Mike FABIAN <mfabian@redhat.com> - 20191019-1
-- Update to upstream snapshot tarball (Fixes for people holding hands)
-
-* Thu Aug 29 2019 Mike FABIAN <mfabian@redhat.com> - 20190829-1
-- Update to upstream snapshot tarball (Fixes FR and NL flags)
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20190709-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Jul 09 2019 Mike FABIAN <mfabian@redhat.com> - 20190709-1
-- Update to upstream snapshot tarball (Contains the new emoji added in Unicode 12.0.0,
-  also fixes the "people holding hands" sequence.
-- Port to Python3 and build using Python3
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20180814-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Aug 14 2018 Mike FABIAN <mfabian@redhat.com> - 20180814-1
-- Update to upstream snapshot tarball (Contains the new emoji added in Unicode 11.0.0)
-
-* Mon Jul 23 2018 Mike FABIAN <mfabian@redhat.com> - 20180508-6
-- Fix build in rawhide
-- Resolves: rhbz#1604247
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 20180508-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jun 26 2018 Peng Wu <pwu@redhat.com> - 20180508-4
-- Fixes buildfont macro
-
-* Tue Jun 19 2018 Peng Wu <pwu@redhat.com> - 20180508-3
-- Only build emoji color font since Fedora 26
 
 * Wed May 23 2018 Peng Wu <pwu@redhat.com> - 20180508-2
 - Use GraphicsMagick instead of ImageMagick