- updated to 3.1.0

diff --git a/python-PyOpenGL.spec b/python-PyOpenGL.spec
index 62fe4bf516f7fb7224b306266721af2e4407c940..2674f86b6977cdf1993604a8b1175af3c5f13300 100644 (file)
--- a/python-PyOpenGL.spec
+++ b/python-PyOpenGL.spec
@@ -2,42 +2,47 @@
 # Conditional build:
 %bcond_without python2 # CPython 2.x module
 %bcond_without python3 # CPython 3.x module
+%bcond_with    tests   # tests (display required)
 
 %define                module          PyOpenGL
 Summary:       OpenGL bindings for Python
 Summary(pl.UTF-8):     Dowiązania do OpenGL dla Pythona
 Name:          python-%{module}
-Version:       3.0.1
-Release:       12
+Version:       3.1.0
+Release:       1
 Epoch:         1
-License:       LGPL
+License:       BSD
 Group:         Development/Languages/Python
-Source0:       http://downloads.sourceforge.net/pyopengl/%{module}-%{version}.tar.gz
-# Source0-md5: 221d4a6a0928fcfeef26751370ec5f52
-Source1:       http://downloads.sourceforge.net/pyopengl/%{module}-Demo-%{version}a1.tar.gz
+#Source0Download: https://pypi.org/simple/pyopengl/
+Source0:       https://files.pythonhosted.org/packages/source/p/pyopengl/%{module}-%{version}.tar.gz
+# Source0-md5: 0de021941018d46d91e5a8c11c071693
+Source1:       http://downloads.sourceforge.net/pyopengl/%{module}-Demo-3.0.1a1.tar.gz
 # Source1-md5: 75b66abdf2d0e5003798c0fa12abee6e
 URL:           http://pyopengl.sourceforge.net/
-BuildRequires: OpenGL-GLU-devel
-BuildRequires: OpenGL-glut-devel
 %if %{with python2}
-BuildRequires: python-numpy-devel
-BuildRequires: python-devel
+BuildRequires: python-devel >= 1:2.5
+BuildRequires: python-setuptools
+%if %{with tests}
+BuildRequires: python-numpy
+BuildRequires: python-pygame
+%endif
 %endif
 %if %{with python3}
-BuildRequires: python3-devel
-BuildRequires: python3-distribute
-BuildRequires: python3-modules
-BuildRequires: python3-numpy-devel
+BuildRequires: python3-devel >= 1:3.2
+BuildRequires: python3-setuptools
+%if %{with tests}
+BuildRequires: python3-numpy
+BuildRequires: python3-pygame
+%endif
 %endif
-%pyrequires_eq python-libs
 BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.710
+BuildRequires: rpmbuild(macros) >= 1.714
+Requires:      python-modules >= 1:2.5
 Requires:      python-numpy
 Obsoletes:     PyOpenGL
+BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _noautoreqdep   libGL.so.1 libGLU.so.1
-
 %description
 OpenGL bindings for Python including support for GL extensions, GLU,
 WGL, GLUT, GLE, and Tk.
@@ -62,6 +67,7 @@ Programy demonstracyjne dla pakietu PyOpenGL.
 Summary:       OpenGL bindings for Python
 Summary(pl.UTF-8):     Dowiązania do OpenGL dla Pythona
 Group:         Libraries/Python
+Requires:      python3-modules >= 1:3.2
 Requires:      python3-numpy
 
 %description -n python3-%{module}
@@ -91,16 +97,29 @@ Programy demonstracyjne dla pakietu PyOpenGL.
 %if %{with python2}
 %py_build
 
-cd %{module}-Demo-%{version}a1
+cd %{module}-Demo-3.0.1a1
 %py_build
 cd ..
+
+%if %{with tests}
+cd tests
+%{__python} test_core.py
+cd ..
+%endif
 %endif
 
 %if %{with python3}
 %py3_build
 
-cd %{module}-Demo-%{version}a1
-%py_build --build-base build-3
+cd %{module}-Demo-3.0.1a1
+%py3_build
+cd ..
+
+%if %{with tests}
+cd tests
+%{__python3} test_core.py
+cd ..
+%endif
 %endif
 
 %install
@@ -109,22 +128,19 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with python2}
 %py_install
 
-cd %{module}-Demo-%{version}a1
+cd %{module}-Demo-3.0.1a1
 %py_install
 cd ..
 
 %py_postclean
-
-#{__rm} -r $RPM_BUILD_ROOT%{py_sitedir}/OpenGL/{Demo,doc}
 %endif
 
 %if %{with python3}
 %py3_install
 
-cd %{module}-Demo-%{version}a1
+cd %{module}-Demo-3.0.1a1
 %py3_install
-
-#{__rm} -r $RPM_BUILD_ROOT%{py3_sitedir}/OpenGL/{Demo,doc}
+cd ..
 %endif
 
 %clean
@@ -133,25 +149,25 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with python2}
 %files
 %defattr(644,root,root,755)
-%doc PKG-INFO
+%doc license.txt
 %{py_sitescriptdir}/OpenGL
-%if "%{py_ver}" > "2.4"
-%{py_sitescriptdir}/*.egg-info
-%endif
+%{py_sitescriptdir}/PyOpenGL-%{version}-py*.egg-info
 
 %files examples
 %defattr(644,root,root,755)
 %{py_sitescriptdir}/PyOpenGL-Demo
+%{py_sitescriptdir}/PyOpenGL_Demo-3.0.1a1-py*.egg-info
 %endif
 
 %if %{with python3}
 %files -n python3-%{module}
 %defattr(644,root,root,755)
-%doc PKG-INFO
+%doc license.txt
 %{py3_sitescriptdir}/OpenGL
-%{py3_sitescriptdir}/*.egg-info
+%{py3_sitescriptdir}/PyOpenGL-%{version}-py*.egg-info
 
 %files -n python3-%{module}-examples
 %defattr(644,root,root,755)
 %{py3_sitescriptdir}/PyOpenGL-Demo
+%{py3_sitescriptdir}/PyOpenGL_Demo-3.0.1a1-py*.egg-info
 %endif