python3 support added

diff --git a/python-matplotlib.spec b/python-matplotlib.spec
index 4779bf670d45628b561d47d21da858057baa388b..0e3e3b0459e79b4c020a94b6b02e0d266a9fc7b3 100644 (file)
--- a/python-matplotlib.spec
+++ b/python-matplotlib.spec
@@ -1,5 +1,10 @@
+# Conditional build:
+%bcond_without  python2 # CPython 2.x module
+%bcond_without  python3 # CPython 3.x module
 # TODO:
 # - use system fonts (cm*.ttf) and metrics in mpl-data dir?
+# - make sure all dependencies that are available for Python3 are build for Python3
+#   and included in BR when neccessary
 %define                module  matplotlib
 Summary:       Matlab(TM) style Python plotting package
 Summary(pl.UTF-8):     Pakiet do rysowania w Pythonie podobny do Matlaba(TM)
@@ -14,7 +19,8 @@ URL:          http://matplotlib.sourceforge.net/
 BuildRequires: freetype-devel
 BuildRequires: libstdc++-devel
 BuildRequires: ncurses-devel
-BuildRequires: python >= 2.4
+%if %{with python2}
+BuildRequires: python >= 1:2.6
 BuildRequires: python-PyQt
 BuildRequires: python-PyQt4
 BuildRequires: python-dateutil
@@ -27,9 +33,26 @@ BuildRequires:       python-pytz
 BuildRequires: python-sip-devel
 BuildRequires: python-tkinter
 BuildRequires: python-wxPython
+%pyrequires_eq python-modules
+%endif
+%if %{with python3}
+BuildRequires: python3 >= 1:3.3
+BuildRequires: python3-2to3
+#BuildRequires:        python3-PyQt
+#BuildRequires:        python3-PyQt4
+BuildRequires: python3-dateutil
+BuildRequires: python3-devel
+BuildRequires: python3-numpy-devel >= 1:1.0.3
+BuildRequires: python3-numpy-numarray-devel
+BuildRequires: python3-pytz
+# Need for import pyqtconfig needed by qt detection.
+#BuildRequires:        python3-sip-devel
+BuildRequires: python3-six
+BuildRequires: python3-tkinter
+#BuildRequires:        python3-wxPython
+%endif
 BuildRequires: rpm-pythonprov
 BuildRequires: tk-devel
-%pyrequires_eq python-modules
 Requires:      python-dateutil
 Requires:      python-numpy >= 1:1.1
 Requires:      python-numpy-oldnumeric
@@ -48,6 +71,24 @@ wykresów matlaba jako inspiracji. Chociaż główna biblioteka jest
 zorientowana obiektowo, jest interfejs funkcyjny "pylab" dla ludzi
 przechodzących z Matlaba.
 
+%package -n python3-%{module}
+Summary:       Matlab(TM) style Python 3 plotting package
+Summary(pl.UTF-8):     Pakiet do rysowania w Pythonie 3 podobny do Matlaba(TM)
+Group:         Libraries/Python
+Requires:      python3-six
+
+%description -n python3-%{module}
+matplotlib strives to produce publication quality 2D graphics using
+matlab plotting for inspiration. Although the main lib is object
+oriented, there is a functional interface "pylab" for people coming
+from Matlab.
+
+%description -n python3-%{module} -l pl.UTF-8
+matplotlib usiłuje tworzyć grafikę 2D o jakości publikacji przy użyciu
+wykresów matlaba jako inspiracji. Chociaż główna biblioteka jest
+zorientowana obiektowo, jest interfejs funkcyjny "pylab" dla ludzi
+przechodzących z Matlaba.
+
 %prep
 %setup -q -n %{module}-%{version}
 
@@ -55,12 +96,20 @@ rm -f setup.cfg
 
 %build
 export CFLAGS="%{rpmcflags}"
+
+%if %{with python2}
 %{__python} setup.py build
+%endif
+
+%if %{with python3}
+%{__python3} setup.py build
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-python setup.py install \
+%if %{with python2}
+%{__python} setup.py install \
        --root=$RPM_BUILD_ROOT \
        --optimize=2
 
@@ -72,10 +121,27 @@ python setup.py install \
 rm -f $RPM_BUILD_ROOT%{py_sitedir}/matplotlib/mpl-data/Vera*.ttf
 
 rm -rf $RPM_BUILD_ROOT%{py_sitedir}/%{module}/tests
+%endif
+
+%if %{with python3}
+%{__python3} setup.py install \
+       --root=$RPM_BUILD_ROOT \
+       --optimize=2
+
+%py3_ocomp $RPM_BUILD_ROOT%{py3_sitedir}
+%py3_comp $RPM_BUILD_ROOT%{py3_sitedir}
+
+# matplotlib can use system fonts, so drop these copies
+rm -f $RPM_BUILD_ROOT%{py3_sitedir}/matplotlib/mpl-data/Vera*.ttf
+
+rm -rf $RPM_BUILD_ROOT%{py3_sitedir}/%{module}/tests
+%endif
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%if %{with python2}
 %files
 %defattr(644,root,root,755)
 %doc CHANGELOG README.txt TODO
@@ -101,3 +167,33 @@ rm -rf $RPM_BUILD_ROOT
 %if "%{py_ver}" > "2.4"
 %{py_sitedir}/%{module}-*.egg-info
 %endif
+%endif
+
+%if %{with python3}
+%files -n python3-%{module}
+%defattr(644,root,root,755)
+%doc CHANGELOG README.txt TODO
+%dir %{py3_sitedir}/%{module}
+%{py3_sitedir}/%{module}/*.py
+%{py3_sitedir}/%{module}/__pycache__
+%attr(755,root,root) %{py3_sitedir}/%{module}/*.so
+%dir %{py3_sitedir}/%{module}/backends
+%{py3_sitedir}/%{module}/backends/*.py
+%{py3_sitedir}/%{module}/backends/__pycache__
+%attr(755,root,root) %{py3_sitedir}/%{module}/backends/*.so
+%dir %{py3_sitedir}/%{module}/backends/qt4_editor
+%{py3_sitedir}/%{module}/backends/qt4_editor/*.py
+%{py3_sitedir}/%{module}/backends/qt4_editor/__pycache__
+%dir %{py3_sitedir}/%{module}/backends/Matplotlib.nib
+%{py3_sitedir}/%{module}/backends/Matplotlib.nib/*.nib
+%{py3_sitedir}/%{module}/delaunay
+%{py3_sitedir}/%{module}/mpl-data
+%{py3_sitedir}/%{module}/projections
+%{py3_sitedir}/%{module}/sphinxext
+%{py3_sitedir}/%{module}/testing
+%{py3_sitedir}/%{module}/tri
+%{py3_sitedir}/mpl_toolkits
+%{py3_sitedir}/pylab.py
+%{py3_sitedir}/__pycache__
+%{py3_sitedir}/%{module}-*.egg-info
+%endif