public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/google-noto-emoji-fonts] rawhide: Remove the color emoji font from this source repo, it has its own source repo now
@ 2026-08-19 13:27 Mike FABIAN
  0 siblings, 0 replies; only message in thread
From: Mike FABIAN @ 2026-08-19 13:27 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/google-noto-emoji-fonts
            Branch : rawhide
            Commit : f170274dba8d254d744df08b046795248ba1d49b
            Author : Mike FABIAN <mfabian@redhat.com>
            Date   : 2026-08-19T15:08:15+02:00
            Stats  : +42/-95 in 6 file(s)
            URL    : https://src.fedoraproject.org/rpms/google-noto-emoji-fonts/c/f170274dba8d254d744df08b046795248ba1d49b?branch=rawhide

            Log:
            Remove the color emoji font from this source repo, it has its own source repo now

See: https://bugzilla.redhat.com/show_bug.cgi?id=2510687

---
diff --git a/.gitignore b/.gitignore
index 13fd65b..d529c26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@
 /noto-emoji-22e5646.tar.gz
 /noto-emoji-b3e3051.tar.gz
 /noto-emoji-8998f5d.tar.gz
+/Noto_Emoji-3.005.zip

diff --git a/google-noto-emoji-color.metainfo.xml b/google-noto-emoji-color.metainfo.xml
deleted file mode 100644
index 4316bcd..0000000
--- a/google-noto-emoji-color.metainfo.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2016 Peng Wu <pwu AT redhat DOT com> -->
-<component type="font">
-  <id>google-noto-emoji-color</id>
-  <metadata_license>CC-BY-3.0</metadata_license>
-  <name>Noto Color Emoji</name>
-  <summary>Google Noto Color Emoji Font</summary>
-  <url type="homepage">https://github.com/googlei18n/noto-emoji</url>
-  <update_contact><!-- upstream-contact_at_email.com --></update_contact>
-  <extends>google-noto</extends>
-</component>

diff --git a/google-noto-emoji-fonts.spec b/google-noto-emoji-fonts.spec
index c74d0a1..8d877df 100644
--- a/google-noto-emoji-fonts.spec
+++ b/google-noto-emoji-fonts.spec
@@ -1,45 +1,20 @@
-# SPDX-License-Identifier: MIT
-
-%global commit0 8998f5dd683424a73e2314a8c1f1e359c19e8742
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
-
 %global fontname google-noto-emoji
 
-# The font build process need to download the code from the internet,
-# skip to build the font.
-%global buildfont 0
-
 BuildRequires:  gcc
 BuildRequires:  fontpackages-devel
-%if %buildfont
-BuildRequires:  fonttools
-BuildRequires:  python3-fonttools
-BuildRequires:  nototools
-BuildRequires:  python3-nototools
-BuildRequires:  python3-devel
-BuildRequires:  GraphicsMagick
-BuildRequires:  pngquant
-BuildRequires:  zopfli
-BuildRequires:  cairo-devel
-%endif
-BuildRequires:  make
-
-Version: 20260526
+
+# Version as found in the font file:
+# $ otfinfo -v static/NotoEmoji-Regular.ttf
+# Version 3.005
+Version: 3.005
 Release: %autorelease
+Epoch:   1
 URL:     https://github.com/googlefonts/noto-emoji
 
 %global foundry           Google
-# In noto-emoji-fonts source
-## noto-emoji code is in ASL 2.0 license
-## Emoji fonts are under OFL license
-### third_party color-emoji code is in BSD license
-### third_party region-flags code is in Public Domain license
-# In nototools source
-## nototools code is in ASL 2.0 license
-### third_party ucd code is in Unicode license
-%global fontlicense       OFL-1.1 AND Apache-2.0
-%global fontlicenses      LICENSE OFL.txt
-%global fontdocs          AUTHORS CONTRIBUTING.md CONTRIBUTORS README.md README.txt
+%global fontlicense       OFL-1.1
+%global fontlicenses      OFL.txt
+%global fontdocs          README.txt
 
 %global fontfamily0       Noto Emoji
 %global fontsummary0      Google “Noto Emoji” Black-and-White emoji font
@@ -48,49 +23,32 @@ URL:     https://github.com/googlefonts/noto-emoji
 This package provides the Google “Noto Emoji” Black-and-White emoji font.
 }
 
-%global fontfamily1       Noto Color Emoji
-%global fontsummary1      Google “Noto Color Emoji” colored emoji font
-%global fontpkgheader1    %{expand:
-Obsoletes:      google-noto-emoji-color-fonts < 20220916-6
-Provides:       google-noto-emoji-color-fonts = %{version}-%{release}
-}
-%global fonts1            Noto-COLRv1.ttf
+%global fontfamily1       Noto Emoji VF
+%global fontsummary1      Google “Noto Emoji” Black-and-White emoji variable font
+%global fonts1            NotoEmoji-VariableFont_wght.ttf
 %global fontdescription1  %{expand:
-This package provides the Google “Noto Color Emoji” colored emoji font.
-}
-
-%global fontfamily2       Noto Emoji VF
-%global fontsummary2      Google “Noto Emoji” Black-and-White emoji variable font
-%global fonts2            NotoEmoji-VariableFont_wght.ttf
-%global fontdescription2  %{expand:
 This package provides the Google “Noto Emoji” Black-and-White emoji variable font.
 }
 
-Source0:        https://github.com/googlefonts/noto-emoji/archive/%{commit0}.tar.gz#/noto-emoji-%{shortcommit0}.tar.gz
-Source4:        Noto_Emoji.zip
+# Download Noto_Emoji.zip from https://fonts.google.com/selection?query=Noto+emoji
+# and check the font versions in the .zip file for example with:
+# $ otfinfo -v NotoEmoji-VariableFont_wght.ttf
+# Version 3.005
+# $ otfinfo -v static/NotoEmoji-Regular.ttf
+# Version 3.005
+# then rename the .zip file:
+Source0: Noto_Emoji-%{version}.zip
 
 
 %fontpkg -a
 
-
 %prep
-%autosetup -p1 -a 4 -n noto-emoji-%{commit0}
-
-rm -rf third_party/pngquant
-
+%autosetup -T -c -n noto-emoji-%{version}
+unzip %{SOURCE0}
 cp -p static/NotoEmoji-Regular.ttf .
 
 %build
 
-%if %buildfont
-# Work around UTF-8
-export LANG=C.UTF-8
-
-%make_build OPT_CFLAGS="$RPM_OPT_FLAGS" BYPASS_SEQUENCE_CHECK='True'
-%else
-cp -p fonts/Noto-COLRv1.ttf .
-%endif
-
 %fontbuild -a
 
 %install

diff --git a/plans/google-noto-color-emoji-fonts.fmf b/plans/google-noto-color-emoji-fonts.fmf
deleted file mode 100644
index 6cb6a2b..0000000
--- a/plans/google-noto-color-emoji-fonts.fmf
+++ /dev/null
@@ -1,18 +0,0 @@
-summary: Fonts related tests
-discover:
-  how: fmf
-  url: https://src.fedoraproject.org/tests/fonts
-  exclude:
-    - generic_alias
-prepare:
-  name: tmt
-  how: install
-  package: google-noto-color-emoji-fonts
-execute:
-  how: tmt
-environment:
-  PACKAGE: google-noto-color-emoji-fonts
-  FONT_ALIAS: emoji
-  FONT_FAMILY: Noto Color Emoji
-  FONT_LANG: und-zsye
-  DEFAULT_EMOJI: 1

diff --git a/plans/google-noto-emoji-fonts.fmf b/plans/google-noto-emoji-fonts.fmf
new file mode 100644
index 0000000..5a41179
--- /dev/null
+++ b/plans/google-noto-emoji-fonts.fmf
@@ -0,0 +1,18 @@
+summary: Fonts related tests
+discover:
+  how: fmf
+  url: https://src.fedoraproject.org/tests/fonts
+  exclude:
+    - generic_alias
+prepare:
+  name: tmt
+  how: install
+  package: google-noto-emoji-fonts
+execute:
+  how: tmt
+environment:
+  PACKAGE: google-noto-emoji-fonts
+  FONT_ALIAS: emoji
+  FONT_FAMILY: Noto Emoji
+  FONT_LANG: und-zsye
+  DEFAULT_EMOJI: 0

diff --git a/sources b/sources
index c17f399..6d9e966 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (noto-emoji-8998f5d.tar.gz) = 41ec1520dbb244451446479e0107cb8d06d893fc7045ec83f7d2dc853291c98fb44f18b1c5cf8d10e4011c40f46542f3038bd667cc216f5affa3a93eb65df85d
-SHA512 (Noto_Emoji.zip) = 5b0d0bf94fb33f109018624a029ebc81883c5a288ba4a7fe1fd183f44137ad5552166af3cd86c26dce4321953e6ad49ff512613537ec33c7a844af270ada466d
+SHA512 (Noto_Emoji-3.005.zip) = 5b0d0bf94fb33f109018624a029ebc81883c5a288ba4a7fe1fd183f44137ad5552166af3cd86c26dce4321953e6ad49ff512613537ec33c7a844af270ada466d

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-08-19 13:27 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-19 13:27 [rpms/google-noto-emoji-fonts] rawhide: Remove the color emoji font from this source repo, it has its own source repo now Mike FABIAN

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox