From 171784bebdda384b1b71dd6fa2a9ca40f3008e92 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Wed, 10 Dec 2025 00:08:19 -0500
Subject: [PATCH 1/2] Conditionalize unicode extra

https://github.com/fonttools/fonttools/commit/121368896a042d6d91276f6977210351fef48b79
resulted in a new dependency on `python-unicodedata2`, which is just a
backport of the Python Standard Library `unicodedata` from the latest (in
development) Python version.  As fonttools is used in RHEL only for
graphite2's test suite without any extras and is not shipped, and the code
falls back to the `unicodedata` of the Python version in use if
`unicodedata2` is absent, this is unnecessary for RHEL.

https://github.com/fedora-eln/eln/issues/375
---
 fonttools.spec | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/fonttools.spec b/fonttools.spec
index c21c099..716cf45 100644
--- a/fonttools.spec
+++ b/fonttools.spec
@@ -15,6 +15,8 @@
 %bcond symfont_extra %{undefined rhel}
 # Requires python-fs:
 %bcond ufo_extra %[ %{undefined rhel} || %{defined epel} ]
+# Requires python-unicodedata2 (depending on python version):
+%bcond unicode_extra %[ %{undefined rhel} || %{defined epel} ]
 # Requires python-brotli, python-zopfli:
 %bcond woff_extra %[ %{undefined rhel} || %{defined epel} ]
 # Requires scipy, munkres, pycairo
@@ -29,7 +31,7 @@ AFM and to an extent Type 1 and some Mac-specific formats.}
 
 Name:           fonttools
 Version:        4.61.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tools to manipulate font files
 
 # https://spdx.org/licenses/MIT.html
@@ -110,7 +112,9 @@ Obsoletes: python3-ufolib <= 2.1.1-11
 %if %{with ufo_extra}
 %pyproject_extras_subpkg -n python3-fonttools ufo
 %endif
+%if %{with unicode_extra}
 %pyproject_extras_subpkg -n python3-fonttools unicode
+%endif
 %if %{with woff_extra}
 %pyproject_extras_subpkg -n python3-fonttools woff
 %endif
@@ -136,7 +140,7 @@ export FONTTOOLS_WITH_CYTHON=1
     %{?with_symfont_extra:-x symfont} \
     -x type1 \
     %{?with_ufo_extra:-x ufo} \
-    -x unicode \
+    %{?with_unicode_extra:-x unicode} \
     %{?with_woff_extra:-x woff} \
     }
 
@@ -197,6 +201,9 @@ k="${k-}${k+ and }not (test_ttcompile_timestamp_calcs)"
 %doc NEWS.rst README.rst
 
 %changelog
+* Wed Dec 10 2025 Yaakov Selkowitz <yselkowi@redhat.com> - 4.61.0-2
+- Conditionalize unicode extra
+
 * Tue Dec 09 2025 Parag Nemade <pnemade AT redhat DOT com> - 4.61.0-1
 - Update to 4.61.0 version (#2419183)
 

From ba93498f65cc0f94f96b4ab5509be5efa88eb75b Mon Sep 17 00:00:00 2001
From: Parag Nemade <pnemade AT redhat DOT com>
Date: Tue, 16 Dec 2025 08:57:06 +0530
Subject: [PATCH 2/2] Update to 4.61.1 version (#2421833)

---
 .gitignore     | 1 +
 fonttools.spec | 7 +++++--
 sources        | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5cbb810..6c09f82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -171,3 +171,4 @@ fonttools-2.3.tar.gz
 /fonttools-4.60.0.tar.gz
 /fonttools-4.60.1.tar.gz
 /fonttools-4.61.0.tar.gz
+/fonttools-4.61.1.tar.gz
diff --git a/fonttools.spec b/fonttools.spec
index 716cf45..950301e 100644
--- a/fonttools.spec
+++ b/fonttools.spec
@@ -30,8 +30,8 @@ an XML text format, which is also called TTX. It supports TrueType, OpenType,
 AFM and to an extent Type 1 and some Mac-specific formats.}
 
 Name:           fonttools
-Version:        4.61.0
-Release:        2%{?dist}
+Version:        4.61.1
+Release:        1%{?dist}
 Summary:        Tools to manipulate font files
 
 # https://spdx.org/licenses/MIT.html
@@ -201,6 +201,9 @@ k="${k-}${k+ and }not (test_ttcompile_timestamp_calcs)"
 %doc NEWS.rst README.rst
 
 %changelog
+* Tue Dec 16 2025 Parag Nemade <pnemade AT redhat DOT com> - 4.61.1-1
+- Update to 4.61.1 version (#2421833)
+
 * Wed Dec 10 2025 Yaakov Selkowitz <yselkowi@redhat.com> - 4.61.0-2
 - Conditionalize unicode extra
 
diff --git a/sources b/sources
index 3fb6e36..0fbd73d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fonttools-4.61.0.tar.gz) = 4c5de3f63fb721817e5225cf928a4dde18c326cc495997452aba9fba057ddf3ddff6410f7ac178ba8fa17d78c11235c02d5898f9f9736cc9a421e20f49459c56
+SHA512 (fonttools-4.61.1.tar.gz) = 3bdf3b1a72268ca9966550db53a25b8a7e9a1438abef9009d09a76e8d718691fdd248f87521c65df59b07728262a4405aee7a94aa2af616d744f7ee815f29c2d