Add runtime depends on libglvnd-opengl also

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1,2 +1,12 @@
 /PyOpenGL-3.1.1a1.tar.gz
 /PyOpenGL-accelerate-3.1.1a1.tar.gz
+/formathandler.pxd
+/wrapper.pxd
+/PyOpenGL-3.1.4.tar.gz
+/PyOpenGL-accelerate-3.1.4.tar.gz
+/PyOpenGL-3.1.5.tar.gz
+/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

python-3.12.patch

@@ -0,0 +1,12 @@
+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",
++        ("_ctypes" if sys.version_info[:2] >= (3,12) else _bi) + ".CArgObject",
+         "ctypes.c_uint",
+         "ctypes.c_int",
+         "ctypes.c_float",

python-pyopengl.spec

@@ -2,13 +2,28 @@
 %global shortname pyopengl
 
 Name:           python-%{shortname}
-Version:        3.1.1a1
-Release:        7%{?dist}
+Version:        3.1.7
+Release:        3%{?dist}
 Summary:        Python bindings for OpenGL
 License:        BSD
-URL:            http://pyopengl.sourceforge.net/
+URL:            https://github.com/mcfletch/pyopengl
 Source0:        https://pypi.python.org/packages/source/P/%{srcname}/%{srcname}-%{version}.tar.gz
 Source1:        https://pypi.python.org/packages/source/P/%{srcname}-accelerate/%{srcname}-accelerate-%{version}.tar.gz
+Patch0:         python-3.12.patch
+
+BuildRequires:  gcc
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+BuildRequires:  python3-numpy
+BuildRequires:  python3-Cython
+
+# For tests
+BuildRequires:  libglvnd-opengl
+BuildRequires:  mesa-dri-drivers
+BuildRequires:  mesa-libGLU
+BuildRequires:  python3-pygame
+BuildRequires:  python3-pytest
+BuildRequires:  xorg-x11-server-Xvfb
 
 %description
 PyOpenGL is the cross platform Python binding to OpenGL and related APIs. It
@@ -20,39 +35,12 @@ PyOpenGL is inter-operable with a large number of external GUI libraries
 for Python including (Tkinter, wxPython, FxPy, PyGame, and Qt). 
 
 
-%package -n     python2-%{shortname}
-Summary:        Python 2 bindings for OpenGL
-BuildRequires:  python2-devel
-BuildRequires:  python2-setuptools
-BuildRequires:  python2-numpy
-Requires:       freeglut
-Requires:       python2-numpy
-%{?python_provide:%python_provide python2-%{shortname}}
-# These can be removed in Fedora 27
-Obsoletes:      PyOpenGL < 3.1.0-7
-Provides:       PyOpenGL = %{version}-%{release}
-
-%description -n python2-%{shortname}
-PyOpenGL is the cross platform Python binding to OpenGL and related APIs. It
-includes support for OpenGL v1.1, GLU, GLUT v3.7, GLE 3 and WGL 4. It also
-includes support for dozens of extensions (where supported in the underlying
-implementation).
-
-PyOpenGL is inter-operable with a large number of external GUI libraries
-for Python including (Tkinter, wxPython, FxPy, PyGame, and Qt). 
-
-
 %package -n     python3-%{shortname}
 Summary:        Python 3 bindings for OpenGL
-BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
-BuildRequires:  python3-numpy
 Requires:       freeglut
+Requires:       libglvnd-opengl
 Requires:       python3-numpy
 %{?python_provide:%python_provide python3-%{shortname}}
-# These can be removed in Fedora 27
-Obsoletes:      python3-PyOpenGL < 3.1.0-7
-Provides:       python3-PyOpenGL = %{version}-%{release}
 
 %description -n python3-%{shortname}
 PyOpenGL is the cross platform Python binding to OpenGL and related APIs. It
@@ -64,29 +52,12 @@ PyOpenGL is inter-operable with a large number of external GUI libraries
 for Python including (Tkinter, wxPython, FxPy, PyGame, and Qt). 
 
 
-%package -n     python2-%{shortname}-tk
-Summary:        %{srcname} Python 2.x Tk widget
-BuildArch:      noarch
-Requires:       python2-%{shortname} = %{version}-%{release}
-Requires:       tkinter
-%{?python_provide:%python_provide python2-%{shortname}-tk}
-# These can be removed in Fedora 27
-Obsoletes:      PyOpenGL-Tk < 3.1.0-7
-Provides:       PyOpenGL-Tk = %{version}-%{release}
-
-%description -n python2-%{shortname}-tk
-%{srcname} Togl (Tk OpenGL widget) 1.6 support for Python 2.x.
-
-
 %package -n     python3-%{shortname}-tk
 Summary:        %{srcname} Python 3.x Tk widget
 BuildArch:      noarch
 Requires:       python3-%{shortname} = %{version}-%{release}
 Requires:       python3-tkinter
 %{?python_provide:%python_provide python3-%{shortname}-tk}
-# These can be removed in Fedora 27
-Obsoletes:      python3-PyOpenGL-Tk < 3.1.0-7
-Provides:       python3-PyOpenGL-Tk = %{version}-%{release}
 
 %description -n python3-%{shortname}-tk
 %{srcname} Togl (Tk OpenGL widget) 1.6 support for Python 3.x.
@@ -94,12 +65,19 @@ Provides:       python3-PyOpenGL-Tk = %{version}-%{release}
 
 %prep
 %setup -q -c -n %{srcname}-%{version} -T -a0 -a1
-
+%patch -P0 -p1
 
 %build
+# Delete all Cython generated .c files to force a rebuild in py3_build
+# (py2_build then reuses the Cython output)
+pushd %{srcname}-accelerate-%{version}/src
+for f in *.pyx ; do
+    rm -f "${f%.pyx}.c"
+done
+popd
+
 for dir in %{srcname}-%{version} %{srcname}-accelerate-%{version} ; do
     pushd $dir
-    %py2_build
     %py3_build
     popd
 done
@@ -108,33 +86,27 @@ done
 %install
 for dir in %{srcname}-%{version} %{srcname}-accelerate-%{version} ; do
     pushd $dir
-    %py2_install
     %py3_install
     popd
 done
 
 # Fix up perms on compiled object files
-find %{buildroot}%{python2_sitearch}/OpenGL_accelerate/ -name *.so -exec chmod 755 '{}' \;
 find %{buildroot}%{python3_sitearch}/OpenGL_accelerate/ -name *.so -exec chmod 755 '{}' \;
 
 # Remove shebangs - note that weirdly these files have a space between
 # the #! and the /, so this sed recipe is not the usual one
-pushd %{buildroot}%{python2_sitelib}/OpenGL/arrays
-sed -i -e '/^#! \//, 1d' buffers.py _buffers.py
-popd
-
 pushd %{buildroot}%{python3_sitelib}/OpenGL/arrays
 sed -i -e '/^#! \//, 1d' buffers.py _buffers.py
 popd
 
 
-%files -n python2-%{shortname}
-%license %{srcname}-%{version}/license.txt
-%{python2_sitelib}/%{srcname}-%{version}-py%{python2_version}.egg-info
-%{python2_sitelib}/OpenGL/
-%exclude %{python2_sitelib}/OpenGL/Tk
-%{python2_sitearch}/OpenGL_accelerate/
-%{python2_sitearch}/%{srcname}_accelerate-%{version}-py%{python2_version}.egg-info/
+%check
+%ifarch s390x
+export PYTEST_ADDOPTS="-k 'not test_buffer_api_basic'"
+%endif
+PYTHONPATH=%{buildroot}%{python3_sitearch}:%{buildroot}%{python3_sitelib} \
+  xvfb-run -a -s "-screen 0 1024x768x24 -ac +extension GLX +render -noreset" \
+  pytest %{srcname}-%{version}/tests
 
 
 %files -n python3-%{shortname}
@@ -146,15 +118,113 @@ popd
 %{python3_sitearch}/%{srcname}_accelerate-%{version}-py%{python3_version}.egg-info/
 
 
-%files -n python2-%{shortname}-tk
-%{python2_sitelib}/OpenGL/Tk
-
-
 %files -n python3-%{shortname}-tk
 %{python3_sitelib}/OpenGL/Tk
 
 
 %changelog
+* Mon Jul 24 2023 Scott Talbert <swt@techie.net> - 3.1.7-3
+- Add runtime depends on libglvnd-opengl also
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jul 18 2023 Scott Talbert <swt@techie.net> - 3.1.7-1
+- Update to new upstream release 3.1.7 (#2209308)
+
+* Tue Jul 18 2023 Scott Talbert <swt@techie.net> - 3.1.6-3
+- Fix FTBFS with Python 3.12 (#2220441)
+
+* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 3.1.6-2
+- Rebuilt for Python 3.12
+
+* Thu Jan 26 2023 Scott Talbert <swt@techie.net> - 3.1.6-1
+- Update to new upstream release 3.1.6 (#2056226)
+- Enable upstream tests
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.5-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.5-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 3.1.5-9
+- Rebuilt for Python 3.11
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.5-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.5-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 3.1.5-6
+- Rebuilt for Python 3.10
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.5-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 3.1.5-3
+- Rebuilt for Python 3.9
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Jan 07 2020 Scott Talbert <swt@techie.net> - 3.1.5-1
+- Update to new upstream release 3.1.5 (#1787861)
+
+* Sun Dec 01 2019 Scott Talbert <swt@techie.net> - 3.1.4-1
+- Update to new upstream release 3.1.4
+
+* Tue Nov 19 2019 Scott Talbert <swt@techie.net> - 3.1.1a1-21
+- Remove Python 2 support
+
+* Fri Oct 04 2019 Gwyn Ciesla <gwync@protonmail.com> - 3.1.1a1-20
+- Rebuilt for new freeglut
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 3.1.1a1-19
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 3.1.1a1-18
+- Rebuilt for Python 3.8
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1a1-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue Jul 16 2019 Petr Viktorin <pviktori@redhat.com> - 3.1.1a1-16
+- Remove build dependency on python2-Cython
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1a1-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Sep 11 2018 Scott Talbert <swt@techie.net> - 3.1.1a1-14
+- Remove unused python2-pyopengl-tk subpackage (#1627406)
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1a1-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jun 26 2018 Jonathan Underwood <Jonathan G. Underwood@gmail.com> - 3.1.1a1-12
+- Add BuildRequires for python{2,3}-Cython
+- Remove uneeded Provides/Obsoletes
+- Force Cython rebuild of c files
+- Add missing .pxd files from upstream github repository
+- Update URL to point to github
+- Rename async.py modules to async_.py to avoid clash with async keyword
+
+* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 3.1.1a1-11
+- Rebuilt for Python 3.7
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1a1-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1a1-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1a1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1a1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 

sources

@@ -1,2 +1,2 @@
-77ee6044ceb2cf952aca89a9b2d3d585  PyOpenGL-3.1.1a1.tar.gz
-04e52af352dd078275a2d5720c4afea2  PyOpenGL-accelerate-3.1.1a1.tar.gz
+SHA512 (PyOpenGL-3.1.7.tar.gz) = add1b4d02e7297f00f82a9c9249d6665029073fe620a1650491af9102a76a16e9320b5f227275b0c273ff5a616c284fd9f25f0f425848676c37cab9f3c22ae2e
+SHA512 (PyOpenGL-accelerate-3.1.7.tar.gz) = 5b6e1a1c7bd026fd94103115e1b0ae84cf268691d66e04a2fdf0dfdab54fe5ab3c119c988a3e37a53dae7c280f5f923be7aa6dee33afb049f32c7c4ca8b23876