diff --git a/.gitignore b/.gitignore index b5b3ee8..0022dd0 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,3 @@ /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 new file mode 100644 index 0000000..0ceed8a --- /dev/null +++ b/python-pyglet-imp.patch @@ -0,0 +1,21 @@ +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 6f56fa7..d5af62e 100644 --- a/python-pyglet.spec +++ b/python-pyglet.spec @@ -4,8 +4,8 @@ %bcond_without tests Name: python-%{srcname} -Version: 2.0.10 -Release: 9%{?dist} +Version: 1.5.27 +Release: 4%{?dist} Summary: A cross-platform windowing and multimedia library for Python License: BSD-3-Clause @@ -20,6 +20,9 @@ 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! @@ -46,15 +49,7 @@ 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 -# 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: @@ -138,7 +133,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_font & test_freetype_face tests are skipped -- they depend on non-free font we remove +# test_freetype_face tests are is 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 \ @@ -147,7 +142,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_openal_listener or test_push_handlers_instance)' \ + -k 'not (test_find_font_match 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 @@ -155,37 +150,12 @@ ln -s %{_datadir}/sounds/purple/*.wav tests/data/media/ %files -n python3-%{srcname} -f %%{pyproject_files} %license LICENSE -%doc README.md RELEASE_NOTES +%doc README.md +%doc RELEASE_NOTES +%doc NOTICE %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) - -* 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 - -* 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 - -* 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 - -* 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 7322f09..102f0ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pyglet-2.0.10-repacked.tar.gz) = 8c780913435b1c17e43dcc99e729a2ea5d6a6e734cce642b8da82547f734cc9ce43732257e4f241eb3803a9edc941a96a762e869043260ff15adc84ba5c6d813 +SHA512 (pyglet-1.5.27-repacked.tar.gz) = 496b1b94bde77e2ddf095d021b0736969abd7e70b5fd24ec56e655c41724aa69201d75c63ffc2196197af1ff822f76341c98baaf71170d3b98f37f535ee86660