From cc5eabb52bd0d12504a3f29f77a7148d2e8031f5 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Jul 18 2023 18:56:28 +0000 Subject: Update to new upstream release 3.1.7 (#2209308) --- diff --git a/.gitignore b/.gitignore index 90cd1d3..3867ef2 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ /PyOpenGL-accelerate-3.1.5.tar.gz /PyOpenGL-3.1.6.tar.gz /PyOpenGL-accelerate-3.1.6.tar.gz +/PyOpenGL-3.1.7.tar.gz +/PyOpenGL-accelerate-3.1.7.tar.gz diff --git a/python-3.12.patch b/python-3.12.patch index 5c4327a..01f141b 100644 --- a/python-3.12.patch +++ b/python-3.12.patch @@ -1,12 +1,12 @@ -diff -up PyOpenGL-3.1.6/PyOpenGL-3.1.6/OpenGL/__init__.py.py312 PyOpenGL-3.1.6/PyOpenGL-3.1.6/OpenGL/__init__.py ---- PyOpenGL-3.1.6/PyOpenGL-3.1.6/OpenGL/__init__.py.py312 2022-02-19 17:44:47.000000000 -0500 -+++ PyOpenGL-3.1.6/PyOpenGL-3.1.6/OpenGL/__init__.py 2023-07-18 10:33:16.209937577 -0400 -@@ -260,7 +260,7 @@ FormatHandler( - 'ctypesparameter', - 'OpenGL.arrays.ctypesparameters.CtypesParameterHandler', +diff -up PyOpenGL-3.1.7/PyOpenGL-3.1.7/OpenGL/__init__.py.py312 PyOpenGL-3.1.7/PyOpenGL-3.1.7/OpenGL/__init__.py +--- PyOpenGL-3.1.7/PyOpenGL-3.1.7/OpenGL/__init__.py.py312 2023-05-22 23:11:41.000000000 -0400 ++++ PyOpenGL-3.1.7/PyOpenGL-3.1.7/OpenGL/__init__.py 2023-07-18 11:49:51.020297012 -0400 +@@ -308,7 +308,7 @@ FormatHandler( + "ctypesparameter", + "OpenGL.arrays.ctypesparameters.CtypesParameterHandler", [ -- _bi+'.CArgObject', +- _bi + ".CArgObject", + ("_ctypes" if sys.version_info[:2] >= (3,12) else _bi) + ".CArgObject", - 'ctypes.c_uint', - 'ctypes.c_int', - 'ctypes.c_float', + "ctypes.c_uint", + "ctypes.c_int", + "ctypes.c_float", diff --git a/python-pyopengl.spec b/python-pyopengl.spec index 2be9f5e..4684623 100644 --- a/python-pyopengl.spec +++ b/python-pyopengl.spec @@ -2,8 +2,8 @@ %global shortname pyopengl Name: python-%{shortname} -Version: 3.1.6 -Release: 3%{?dist} +Version: 3.1.7 +Release: 1%{?dist} Summary: Python bindings for OpenGL License: BSD URL: https://github.com/mcfletch/pyopengl @@ -18,6 +18,7 @@ BuildRequires: python3-numpy BuildRequires: python3-Cython # For tests +BuildRequires: libglvnd-opengl BuildRequires: mesa-dri-drivers BuildRequires: mesa-libGLU BuildRequires: python3-pygame @@ -121,6 +122,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch}:%{buildroot}%{python3_sitelib} \ %changelog +* Tue Jul 18 2023 Scott Talbert - 3.1.7-1 +- Update to new upstream release 3.1.7 (#2209308) + * Tue Jul 18 2023 Scott Talbert - 3.1.6-3 - Fix FTBFS with Python 3.12 (#2220441) diff --git a/sources b/sources index accb26f..682e3d1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (PyOpenGL-3.1.6.tar.gz) = b6f2f083df0fd7cf8f8a1077f42fa388bce94c0edde00ed6492104af8306c9925b74649cd2c222be4205b0892e7975de2f7591d0f0bcd9540eb53c0de95fec00 -SHA512 (PyOpenGL-accelerate-3.1.6.tar.gz) = 39e7220ef6215ea63c7a34d3c59b560057b4d66962c8ea20e2ab858287f70e3ea9d0b344b1ac4ea98ade4c43ead55c2a9bb4fcbee48cc1517e76d426b0eec149 +SHA512 (PyOpenGL-3.1.7.tar.gz) = add1b4d02e7297f00f82a9c9249d6665029073fe620a1650491af9102a76a16e9320b5f227275b0c273ff5a616c284fd9f25f0f425848676c37cab9f3c22ae2e +SHA512 (PyOpenGL-accelerate-3.1.7.tar.gz) = 5b6e1a1c7bd026fd94103115e1b0ae84cf268691d66e04a2fdf0dfdab54fe5ab3c119c988a3e37a53dae7c280f5f923be7aa6dee33afb049f32c7c4ca8b23876