fcami pushed to PyOpenGL (master). "add PyOpenGL-accelerate"

[notifications at fedoraproject.org]

From d98d4b8e9f51320baf2e4e531cf50d208d070587 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Cami?= <fcami at fedoraproject.org>
Date: Wed, 27 May 2015 23:01:18 +0200
Subject: add PyOpenGL-accelerate


diff --git a/.gitignore b/.gitignore
index 4868dbf..6da27f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ PyOpenGL-3.0.0.tar.gz
 /PyOpenGL-3.1.0b2.tar.gz
 /PyOpenGL-3.1.0b3.tar.gz
 /PyOpenGL-3.1.0.tar.gz
+/PyOpenGL-accelerate-3.1.0.tar.gz
diff --git a/PyOpenGL.spec b/PyOpenGL.spec
index 2cadb36..2e7682d 100644
--- a/PyOpenGL.spec
+++ b/PyOpenGL.spec
@@ -1,13 +1,14 @@
 Name:           PyOpenGL
 Version:        3.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python 2.x bindings for OpenGL
 License:        BSD
 URL:            http://pyopengl.sourceforge.net/
 Source0:        https://pypi.python.org/packages/source/P/%{name}/%{name}-%{version}.tar.gz
-BuildArch:      noarch
+Source1:        https://pypi.python.org/packages/source/P/%{name}-accelerate/%{name}-accelerate-%{version}.tar.gz
 BuildRequires:  python2-devel 
 BuildRequires:  python-setuptools
+BuildRequires:  numpy
 Requires:       freeglut
 Requires:       numpy
 
@@ -24,6 +25,7 @@ for Python including (Tkinter, wxPython, FxPy, PyGame, and Qt).
 Summary:        Python 3.x bindings for OpenGL
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
+BuildRequires:  python3-numpy
 Requires:       freeglut
 Requires:       python3-numpy
 
@@ -38,6 +40,7 @@ for Python including (Tkinter, wxPython, FxPy, PyGame, and Qt).
 
 %package        Tk
 Summary:        %{name} Python 2.x Tk widget
+BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
 Requires:       tkinter
 
@@ -46,6 +49,7 @@ Requires:       tkinter
 
 %package -n     python3-%{name}-Tk
 Summary:        %{name} Python 3.x Tk widget
+BuildArch:      noarch
 Requires:       python3-%{name} = %{version}-%{release}
 Requires:       python3-tkinter
 
@@ -53,20 +57,43 @@ Requires:       python3-tkinter
 %{name} Togl (Tk OpenGL widget) 1.6 support for Python 3.x.
 
 %prep
-%setup -q
+%setup -q -c -n %{name}-%{version} -T -a0 -a1
+
 rm -rf %{py3dir}
-cp -a . %{py3dir}
+mkdir -p %{py3dir}
+
+for dir in %{name}-%{version} %{name}-accelerate-%{version} ; do
+    cp -ar ${dir} %{py3dir}
+done
 
 %build
-%{__python2} setup.py build
+for dir in %{name}-%{version} %{name}-accelerate-%{version} ; do
+    pushd $dir
+    %{__python2} setup.py build
+    popd
+done
+
 pushd %{py3dir}
-%{__python3} setup.py build
+for dir in %{name}-%{version} %{name}-accelerate-%{version} ; do
+    pushd $dir
+    %{__python3} setup.py build
+    popd
+done
 popd
 
 %install
-%{__python2} setup.py install -O1 --skip-build --root="%{buildroot}" --prefix="%{_prefix}"
+for dir in %{name}-%{version} %{name}-accelerate-%{version} ; do
+    pushd $dir
+    %{__python2} setup.py install -O1 --skip-build --root="%{buildroot}" --prefix="%{_prefix}"
+    popd
+done
+
 pushd %{py3dir}
-%{__python3} setup.py install -O1 --skip-build --root="%{buildroot}" --prefix="%{_prefix}"
+for dir in %{name}-%{version} %{name}-accelerate-%{version} ; do
+    pushd $dir
+    %{__python3} setup.py install -O1 --skip-build --root="%{buildroot}" --prefix="%{_prefix}"
+    popd
+done
 popd
 
 #find %{buildroot}%{python2_sitelib}/%{name}-%{version}-py?.?.egg-info \
@@ -77,16 +104,20 @@ popd
 #  -type f -exec chmod +x '{}' \;
 
 %files
-%doc license.txt
+%doc %{name}-%{version}/license.txt
 %{python2_sitelib}/%{name}-%{version}-py%{python2_version}.egg-info
 %{python2_sitelib}/OpenGL/
 %exclude %{python2_sitelib}/OpenGL/Tk
+%{python2_sitearch}/OpenGL_accelerate/
+%{python2_sitearch}/%{name}_accelerate-%{version}-py%{python2_version}.egg-info/
 
 %files -n python3-%{name}
-%doc license.txt
+%doc %{name}-%{version}/license.txt
 %{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info
 %{python3_sitelib}/OpenGL/
 %exclude %{python3_sitelib}/OpenGL/Tk
+%{python3_sitearch}/OpenGL_accelerate/
+%{python3_sitearch}/%{name}_accelerate-%{version}-py%{python3_version}.egg-info/
 
 %files Tk
 %{python2_sitelib}/OpenGL/Tk
@@ -95,6 +126,11 @@ popd
 %{python3_sitelib}/OpenGL/Tk
 
 %changelog
+* Wed Apr  1 2015 Jonathan Underwood <Jonathan G. Underwood at gmail.com> - 3.1.0-2
+- Add accelerate modules for Python 2 and 3
+- Package is no longer noarch
+- Tk sub-packages are noarch
+
 * Thu Jul 31 2014 Christopher Meng <rpm at cicku.me> - 3.1.0-1
 - Update to 3.1.0
 - Correct the python3 package dependency.
diff --git a/sources b/sources
index 6b2681c..0dc660b 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 0de021941018d46d91e5a8c11c071693  PyOpenGL-3.1.0.tar.gz
+489338a4818fa63ea54ff3de1b48995c  PyOpenGL-accelerate-3.1.0.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/PyOpenGL.git/commit/?h=master&id=d98d4b8e9f51320baf2e4e531cf50d208d070587