Compare commits

..

No commits in common. "rawhide" and "f32" have entirely different histories.
rawhide ... f32

4 changed files with 9 additions and 92 deletions

4
.gitignore vendored
View File

@ -6,7 +6,3 @@
/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

View File

@ -1,12 +0,0 @@
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",

View File

@ -2,28 +2,13 @@
%global shortname pyopengl
Name: python-%{shortname}
Version: 3.1.7
Release: 3%{?dist}
Version: 3.1.5
Release: 2%{?dist}
Summary: Python bindings for OpenGL
License: BSD
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
@ -37,8 +22,12 @@ for Python including (Tkinter, wxPython, FxPy, PyGame, and Qt).
%package -n python3-%{shortname}
Summary: Python 3 bindings for OpenGL
BuildRequires: gcc
BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: python3-numpy
BuildRequires: python3-Cython
Requires: freeglut
Requires: libglvnd-opengl
Requires: python3-numpy
%{?python_provide:%python_provide python3-%{shortname}}
@ -65,7 +54,6 @@ Requires: python3-tkinter
%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
@ -100,15 +88,6 @@ sed -i -e '/^#! \//, 1d' buffers.py _buffers.py
popd
%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}
%license %{srcname}-%{version}/license.txt
%{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info
@ -123,52 +102,6 @@ PYTHONPATH=%{buildroot}%{python3_sitearch}:%{buildroot}%{python3_sitelib} \
%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

View File

@ -1,2 +1,2 @@
SHA512 (PyOpenGL-3.1.7.tar.gz) = add1b4d02e7297f00f82a9c9249d6665029073fe620a1650491af9102a76a16e9320b5f227275b0c273ff5a616c284fd9f25f0f425848676c37cab9f3c22ae2e
SHA512 (PyOpenGL-accelerate-3.1.7.tar.gz) = 5b6e1a1c7bd026fd94103115e1b0ae84cf268691d66e04a2fdf0dfdab54fe5ab3c119c988a3e37a53dae7c280f5f923be7aa6dee33afb049f32c7c4ca8b23876
SHA512 (PyOpenGL-3.1.5.tar.gz) = 5d90fc68040b4886e46ff69a59be9e3a8e31e3e1295283756db86d50a1efe681986928e18eb55d20fd2660f863653301ea483425bbe24046f55085b44f4906eb
SHA512 (PyOpenGL-accelerate-3.1.5.tar.gz) = 60a0305bd517f761ef4a01a590162037bf84fa01315c505c3e7d8bd6091d10929281315a467cc4a8ee837c881f498c6d77ed161bc047eb87968606047e0b8be0