From e48a0d40a9642bbf0580461c865a9885c8111894 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Fri, 16 Jun 2023 17:41:21 -0600
Subject: [PATCH] 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 <orion@nwra.com> - 2.0.10-1
+- Update to 2.0.10
+
 * Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 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