From e48a0d40a9642bbf0580461c865a9885c8111894 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 16 Jun 2023 17:41:21 -0600 Subject: [PATCH 1/9] Update to 2.0.10 --- .gitignore | 1 + python-pyglet-imp.patch | 21 --------------------- python-pyglet.spec | 23 +++++++++++++---------- sources | 2 +- 4 files changed, 15 insertions(+), 32 deletions(-) delete mode 100644 python-pyglet-imp.patch diff --git a/.gitignore b/.gitignore index 0022dd0..b5b3ee8 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /pyglet-1.5.16-repacked.tar.gz /pyglet-1.5.23-repacked.tar.gz /pyglet-1.5.27-repacked.tar.gz +/pyglet-2.0.10-repacked.tar.gz diff --git a/python-pyglet-imp.patch b/python-pyglet-imp.patch deleted file mode 100644 index 0ceed8a..0000000 --- a/python-pyglet-imp.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up pyglet-1.5.27/tests/integration/test_toplevel_imports.py.imp pyglet-1.5.27/tests/integration/test_toplevel_imports.py ---- pyglet-1.5.27/tests/integration/test_toplevel_imports.py.imp 2023-06-17 07:55:27.061254060 -0600 -+++ pyglet-1.5.27/tests/integration/test_toplevel_imports.py 2023-06-17 08:01:50.139739485 -0600 -@@ -5,7 +5,7 @@ - This _must_ be the first test run. - ''' - --import imp -+import importlib - import unittest - - import pyglet -@@ -47,7 +47,7 @@ def add_module_tests(name, bases, dict): - def create_test(components): - def test_module(self): - top = pyglet -- imp.reload(top) -+ importlib.reload(top) - for component in components: - self.assertTrue(hasattr(top, component), - 'Cannot access "%s" in "%s"' % (component, top.__name__)) diff --git a/python-pyglet.spec b/python-pyglet.spec index d5af62e..a4d7805 100644 --- a/python-pyglet.spec +++ b/python-pyglet.spec @@ -4,8 +4,8 @@ %bcond_without tests Name: python-%{srcname} -Version: 1.5.27 -Release: 4%{?dist} +Version: 2.0.10 +Release: 1%{?dist} Summary: A cross-platform windowing and multimedia library for Python License: BSD-3-Clause @@ -20,9 +20,6 @@ URL: http://www.pyglet.org/ Source0: %{versionedname}-repacked.tar.gz Source1: pyglet-get-tarball.sh -# Use importlib instead of imp -Patch0: python-pyglet-imp.patch - # Note that unbundling pypng removes "PNGImageDecoder", which is normally # available for advanced use cases. Instead of: # img = image.load(fname, decoder=PNGImageDecoder) # don't use! @@ -49,6 +46,11 @@ BuildRequires: gtk2-devel BuildRequires: gdk-pixbuf2-devel # libpurple has sound files unbundled in the repacked tarball BuildRequires: libpurple +# These tests fail in koji, likely due to missing devices +#BuildRequires: openal-soft +# Some tests fail if this is present +# https://github.com/pyglet/pyglet/issues/875 +#BuildRequires: python3-pytest-asyncio %endif @@ -133,7 +135,7 @@ ln -s %{_datadir}/sounds/purple/*.wav tests/data/media/ # Interactive tests are skipped for obvious reasons. # Media player tests are skipped -- we don't have PulseAudio running. # test_find_font_match & test_have_font skipped -- they look for a font named 'arial' -# test_freetype_face tests are is skipped -- they depend on non-free font we remove +# test_font & test_freetype_face tests are skipped -- they depend on non-free font we remove # test_push_handlers_instance has broken mocking: https://github.com/pyglet/pyglet/issues/606 # GdkPixBufTest.test_load_animation uses dinosaur.gif which we remove %pytest \ @@ -142,7 +144,7 @@ ln -s %{_datadir}/sounds/purple/*.wav tests/data/media/ --ignore=tests/interactive \ --ignore=tests/integration/media \ -m 'not (requires_user_action or requires_user_validation or only_interactive)' \ - -k 'not (test_find_font_match or test_have_font or test_freetype_face or test_push_handlers_instance)' \ + -k 'not (test_find_font_match or test_font or test_have_font or test_freetype_face or test_push_handlers_instance)' \ --deselect tests/integration/image/test_gdkpixbuf2.py::GdkPixBufTest::test_load_animation \ tests %endif @@ -150,12 +152,13 @@ ln -s %{_datadir}/sounds/purple/*.wav tests/data/media/ %files -n python3-%{srcname} -f %%{pyproject_files} %license LICENSE -%doc README.md -%doc RELEASE_NOTES -%doc NOTICE +%doc README.md RELEASE_NOTES %changelog +* Sat Feb 17 2024 Orion Poplawski - 2.0.10-1 +- Update to 2.0.10 + * Fri Jan 26 2024 Fedora Release Engineering - 1.5.27-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 102f0ab..7322f09 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pyglet-1.5.27-repacked.tar.gz) = 496b1b94bde77e2ddf095d021b0736969abd7e70b5fd24ec56e655c41724aa69201d75c63ffc2196197af1ff822f76341c98baaf71170d3b98f37f535ee86660 +SHA512 (pyglet-2.0.10-repacked.tar.gz) = 8c780913435b1c17e43dcc99e729a2ea5d6a6e734cce642b8da82547f734cc9ce43732257e4f241eb3803a9edc941a96a762e869043260ff15adc84ba5c6d813 From 6b74c26aa9b81b81eface36331aad2358d7e3259 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sat, 8 Jun 2024 10:32:36 +0200 Subject: [PATCH 2/9] Rebuilt for Python 3.13 --- python-pyglet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pyglet.spec b/python-pyglet.spec index a4d7805..cc65cc8 100644 --- a/python-pyglet.spec +++ b/python-pyglet.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 2.0.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A cross-platform windowing and multimedia library for Python License: BSD-3-Clause @@ -156,6 +156,9 @@ ln -s %{_datadir}/sounds/purple/*.wav tests/data/media/ %changelog +* Sat Jun 08 2024 Python Maint - 2.0.10-2 +- Rebuilt for Python 3.13 + * Sat Feb 17 2024 Orion Poplawski - 2.0.10-1 - Update to 2.0.10 From 667c6f86e57d0d62679fb30bf9f425b4f2eeafd5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 14:30:09 +0000 Subject: [PATCH 3/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- python-pyglet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pyglet.spec b/python-pyglet.spec index cc65cc8..fe4f412 100644 --- a/python-pyglet.spec +++ b/python-pyglet.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 2.0.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A cross-platform windowing and multimedia library for Python License: BSD-3-Clause @@ -156,6 +156,9 @@ ln -s %{_datadir}/sounds/purple/*.wav tests/data/media/ %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 2.0.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jun 08 2024 Python Maint - 2.0.10-2 - Rebuilt for Python 3.13 From 12b9a27507cd658fb83212a46995c9c375d11416 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 17:46:29 +0000 Subject: [PATCH 4/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- python-pyglet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pyglet.spec b/python-pyglet.spec index fe4f412..df69608 100644 --- a/python-pyglet.spec +++ b/python-pyglet.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 2.0.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A cross-platform windowing and multimedia library for Python License: BSD-3-Clause @@ -156,6 +156,9 @@ ln -s %{_datadir}/sounds/purple/*.wav tests/data/media/ %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 2.0.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 19 2024 Fedora Release Engineering - 2.0.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 66ed799c92731b3bcf4f594077c41fa8b4b4910a Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 16:25:05 +0200 Subject: [PATCH 5/9] Rebuilt for Python 3.14 --- python-pyglet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pyglet.spec b/python-pyglet.spec index df69608..e5e3174 100644 --- a/python-pyglet.spec +++ b/python-pyglet.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 2.0.10 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A cross-platform windowing and multimedia library for Python License: BSD-3-Clause @@ -156,6 +156,9 @@ ln -s %{_datadir}/sounds/purple/*.wav tests/data/media/ %changelog +* Tue Jun 03 2025 Python Maint - 2.0.10-5 +- Rebuilt for Python 3.14 + * Sat Jan 18 2025 Fedora Release Engineering - 2.0.10-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 53f7e6738c4ddc316547fe24942d8da499be07e3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 09:37:34 +0000 Subject: [PATCH 6/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- python-pyglet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pyglet.spec b/python-pyglet.spec index e5e3174..3885df2 100644 --- a/python-pyglet.spec +++ b/python-pyglet.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 2.0.10 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A cross-platform windowing and multimedia library for Python License: BSD-3-Clause @@ -156,6 +156,9 @@ ln -s %{_datadir}/sounds/purple/*.wav tests/data/media/ %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.0.10-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jun 03 2025 Python Maint - 2.0.10-5 - Rebuilt for Python 3.14 From 4352bae0424698f2f9be44e7903a069ab61e762a Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 14:30:21 +0200 Subject: [PATCH 7/9] Rebuilt for Python 3.14.0rc2 bytecode --- python-pyglet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pyglet.spec b/python-pyglet.spec index 3885df2..318f700 100644 --- a/python-pyglet.spec +++ b/python-pyglet.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 2.0.10 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A cross-platform windowing and multimedia library for Python License: BSD-3-Clause @@ -156,6 +156,9 @@ ln -s %{_datadir}/sounds/purple/*.wav tests/data/media/ %changelog +* Fri Aug 15 2025 Python Maint - 2.0.10-7 +- Rebuilt for Python 3.14.0rc2 bytecode + * Fri Jul 25 2025 Fedora Release Engineering - 2.0.10-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 1b119c95cc023edc0da96d87c44d840cc46bd25b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 22 Aug 2025 19:43:14 -0600 Subject: [PATCH 8/9] Add BR/R on python3-gobject, skip openal test (FTBFS rhbz#2379002) --- python-pyglet.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/python-pyglet.spec b/python-pyglet.spec index 318f700..3a41234 100644 --- a/python-pyglet.spec +++ b/python-pyglet.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 2.0.10 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A cross-platform windowing and multimedia library for Python License: BSD-3-Clause @@ -48,10 +48,13 @@ BuildRequires: gdk-pixbuf2-devel BuildRequires: libpurple # These tests fail in koji, likely due to missing devices #BuildRequires: openal-soft +# These are not specified by upstream +BuildRequires: python3-gobject # Some tests fail if this is present # https://github.com/pyglet/pyglet/issues/875 #BuildRequires: python3-pytest-asyncio %endif +Requires: python3-gobject %global _description %{expand: @@ -144,7 +147,7 @@ ln -s %{_datadir}/sounds/purple/*.wav tests/data/media/ --ignore=tests/interactive \ --ignore=tests/integration/media \ -m 'not (requires_user_action or requires_user_validation or only_interactive)' \ - -k 'not (test_find_font_match or test_font or test_have_font or test_freetype_face or test_push_handlers_instance)' \ + -k 'not (test_find_font_match or test_font or test_have_font or test_freetype_face or test_openal_listener or test_push_handlers_instance)' \ --deselect tests/integration/image/test_gdkpixbuf2.py::GdkPixBufTest::test_load_animation \ tests %endif @@ -156,6 +159,9 @@ ln -s %{_datadir}/sounds/purple/*.wav tests/data/media/ %changelog +* Sat Aug 23 2025 Orion Poplawski - 2.0.10-8 +- Add BR/R on python3-gobject, skip openal test (FTBFS rhbz#2379002) + * Fri Aug 15 2025 Python Maint - 2.0.10-7 - Rebuilt for Python 3.14.0rc2 bytecode From d7cb717046092b487bec9f941ae6714af388b927 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 14:05:42 +0200 Subject: [PATCH 9/9] Rebuilt for Python 3.14.0rc3 bytecode --- python-pyglet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pyglet.spec b/python-pyglet.spec index 3a41234..6f56fa7 100644 --- a/python-pyglet.spec +++ b/python-pyglet.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 2.0.10 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A cross-platform windowing and multimedia library for Python License: BSD-3-Clause @@ -159,6 +159,9 @@ ln -s %{_datadir}/sounds/purple/*.wav tests/data/media/ %changelog +* Fri Sep 19 2025 Python Maint - 2.0.10-9 +- Rebuilt for Python 3.14.0rc3 bytecode + * Sat Aug 23 2025 Orion Poplawski - 2.0.10-8 - Add BR/R on python3-gobject, skip openal test (FTBFS rhbz#2379002)