- Release 1. More BRs

Changed files:
    python-matplotlib.spec -> 1.21

diff --git a/python-matplotlib.spec b/python-matplotlib.spec
index ee449202a550c179512a60ff978922a52d1c970f..0ab59563f000b2a5b6ea08276e11855e42c2fb0e 100644 (file)
--- a/python-matplotlib.spec
+++ b/python-matplotlib.spec
@@ -6,7 +6,7 @@ Summary:        Matlab(TM) style Python plotting package
 Summary(pl.UTF-8):     Pakiet do rysowania w Pythonie podobny do Matlaba(TM)
 Name:          python-%{module}
 Version:       0.98.5.2
-Release:       0.1
+Release:       1
 License:       GPL
 Group:         Libraries/Python
 # http://downloads.sourceforge.net/matplotlib/matplotlib-0.98.5.2.tar.gz?modtime=1229668616&big_mirror=0
@@ -22,7 +22,13 @@ BuildRequires:       python-devel
 BuildRequires: python-numpy-devel >= 1:1.0.3
 BuildRequires: python-numpy-numarray-devel
 BuildRequires: python-pygtk-devel
+BuildRequires: python-PyQt
+BuildRequires: python-PyQt4
 BuildRequires: python-pytz
+# Need for import pyqtconfig needed by qt detection.
+BuildRequires: python-sip-devel
+BuildRequires: python-tkinter
+BuildRequires: python-wxPython
 BuildRequires: tk-devel
 %pyrequires_eq python-modules
 Requires:      python-dateutil
@@ -47,7 +53,8 @@ przechodzących z Matlaba.
 %setup -q -n %{module}-%{version}
 
 %build
-python setup.py build
+export CFLAGS="%{rpmcflags}"
+%{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -56,7 +63,9 @@ python setup.py install \
        --root=$RPM_BUILD_ROOT \
        --optimize=2
 
-find $RPM_BUILD_ROOT%{py_sitedir} -name \*.py | xargs rm -f
+%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
+%py_comp $RPM_BUILD_ROOT%{py_sitedir}
+%py_postclean
 
 # matplotlib can use system fonts, so drop these copies
 rm -f $RPM_BUILD_ROOT%{py_sitedir}/matplotlib/mpl-data/Vera*.ttf
@@ -73,21 +82,12 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{py_sitedir}/%{module}/backends
 %{py_sitedir}/%{module}/backends/*.py[co]
 %attr(755,root,root) %{py_sitedir}/%{module}/backends/*.so
-# %dir %{py_sitedir}/%{module}/enthought
-# %{py_sitedir}/%{module}/enthought/*.py[co]
-# %{py_sitedir}/%{module}/enthought/resource
-#%dir %{py_sitedir}/%{module}/enthought/traits
-#%{py_sitedir}/%{module}/enthought/traits/*.py[co]
-#%attr(755,root,root) %{py_sitedir}/%{module}/enthought/traits/*.so
-#%{py_sitedir}/%{module}/enthought/traits/ui
-#%{py_sitedir}/%{module}/enthought/util
 %{py_sitedir}/%{module}/delaunay
 %{py_sitedir}/%{module}/mpl-data
 %{py_sitedir}/%{module}/numerix
 %{py_sitedir}/%{module}/projections
 
 %{py_sitedir}/mpl_toolkits
-# %{py_sitedir}/%{module}/toolkits
 %{py_sitedir}/pylab.py[co]
 %if "%{py_ver}" > "2.4"
 %{py_sitedir}/%{module}-*.egg-info