diff --git a/PyOpenGL-3.1.3b1.tar.gz b/PyOpenGL-3.1.3b1.tar.gz
deleted file mode 100644
index fefc605..0000000
--- a/PyOpenGL-3.1.3b1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:85cd5372636b8bda173a261b0d572500b2a3432105eaad1311ecd61b372bd6e8
-size 1815909
diff --git a/PyOpenGL-3.1.3b2.tar.gz b/PyOpenGL-3.1.3b2.tar.gz
new file mode 100644
index 0000000..00deb52
--- /dev/null
+++ b/PyOpenGL-3.1.3b2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ac73b4c0b433be02d6a55b9ed768acf07003a92a3315ba9d62bc8f8da5f0c291
+size 1816589
diff --git a/_multibuild b/_multibuild
new file mode 100644
index 0000000..fcc7b97
--- /dev/null
+++ b/_multibuild
@@ -0,0 +1,3 @@
+
+ test
+
diff --git a/python-opengl.changes b/python-opengl.changes
index dc1da38..c9dd6d9 100644
--- a/python-opengl.changes
+++ b/python-opengl.changes
@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Mon Sep 9 09:30:18 UTC 2019 - Tomáš Chvátal
+
+- Switch to multibuild to avoid buildcycle
+
+-------------------------------------------------------------------
+Sun Aug 18 05:11:27 UTC 2019 - John Vandenberg
+
+- Remove CFLAGS for noarch package
+- Use setuptools to build the package
+- Expand scope of fdupes to include egg-info
+- Activate test suite, disabled using bcond check on platforms
+ without test dependency pygame, and with test_buffer_api_basic
+ disabled on platforms other than x86_64 and aarch64 due to
+ failures caused by the installation of opengel-accelerate
+- Change optional dependencies tk and numpy to Recommends
+ instead of mandatory run time dependencies
+- Add missing python-tk to Recommends to complement tk
+- Change mtime adjustment algorithm to be more reflective of the
+ source date, based on OpenGL/__init__.py instead of .changes
+- Upgrade to 3.1.3b2
+ - Python 3.7 compatibility fixes
+
-------------------------------------------------------------------
Tue Dec 4 12:51:01 UTC 2018 - Matej Cepl
diff --git a/python-opengl.spec b/python-opengl.spec
index c66c174..ec54fcf 100644
--- a/python-opengl.spec
+++ b/python-opengl.spec
@@ -1,7 +1,7 @@
#
# spec file for package python-opengl
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,30 +17,50 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "test"
+%define psuffix -test
+%bcond_without test
+%else
+%define psuffix %{nil}
+%bcond_with test
+%endif
%define tarname PyOpenGL
-Name: python-opengl
-Version: 3.1.3b1
+Name: python-opengl%{psuffix}
+Version: 3.1.3b2
Release: 0
Summary: OpenGL bindings for Python
License: BSD-3-Clause
Group: Development/Libraries/Python
URL: http://pyopengl.sourceforge.net
Source0: https://files.pythonhosted.org/packages/source/P/%{tarname}/%{tarname}-%{version}.tar.gz
-Source1: %{name}.changes
-BuildRequires: %{python_module Pillow}
-BuildRequires: %{python_module numpy}
+BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
+BuildRequires: python-rpm-macros
+Recommends: python-numpy
+Recommends: python-opengl-accelerate
+Recommends: python-tk
+Recommends: tk >= 8.1
+BuildArch: noarch
+%if %{with test}
+BuildRequires: %{python_module Pillow}
+BuildRequires: %{python_module opengl-accelerate}
+BuildRequires: %{python_module psutil}
+BuildRequires: %{python_module pygame}
+BuildRequires: %{python_module pytest}
+BuildRequires: Mesa-dri
BuildRequires: freeglut-devel
BuildRequires: libdrm-devel
BuildRequires: libgle-devel
-BuildRequires: python-rpm-macros
+BuildRequires: python3-numpy
BuildRequires: swig
BuildRequires: tk-devel
-BuildRequires: xorg-x11
-Requires: python-numpy
-Requires: tk >= 8.1
-Recommends: python-opengl-accelerate
-BuildArch: noarch
+BuildRequires: xvfb-run
+BuildRequires: pkgconfig(gl)
+BuildRequires: pkgconfig(glu)
+BuildRequires: pkgconfig(x11)
+BuildRequires: pkgconfig(xcb-glx)
+%endif
%python_subpackages
%description
@@ -52,20 +72,32 @@ WGL, GLUT, GLE, and Tk.
# remove shebang
sed -e '1d' -i OpenGL/arrays/_buffers.py OpenGL/arrays/buffers.py
# avoid "python-bytecode-inconsistent-mtime" warning
-FAKE_TIMESTAMP=$(LC_ALL=C date -u -r %{SOURCE1} +%%y%%m%%d%%H%%M)
+FAKE_TIMESTAMP=$(LC_ALL=C date -u -r OpenGL/__init__.py +%%y%%m%%d%%H%%M)
find . -name '*.py' -exec touch -mat $FAKE_TIMESTAMP {} \;
%build
-export CFLAGS="%{optflags} -DGLX_GLXEXT_LEGACY"
%python_build
%install
+%if !%{with test}
%python_install
-%python_expand %fdupes -s %{buildroot}%{$python_sitelib}/OpenGL/
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
+%endif
+%if %{with test}
+%check
+# test_buffer_api_basic is a test specific to opengl-accelerate, failing on i586 and armv7l
+# https://github.com/mcfletch/pyopengl/issues/29
+%{python_expand #
+xvfb-run -s "-screen 0 1400x900x24 +iglx" $python -m pytest -v tests -k "not test_buffer_api_basic"
+}
+%endif
+
+%if !%{with test}
%files %{python_files}
%license license.txt
%{python_sitelib}/OpenGL/
%{python_sitelib}/PyOpenGL-%{version}-py%{python_version}.egg-info
+%endif
%changelog