SPECS: python-matplotlib.spec - Release 1. More BRs

[matkor]

Author: matkor                       Date: Sat Dec 27 20:42:44 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- Release 1. More BRs

---- Files affected:
SPECS:
   python-matplotlib.spec (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: SPECS/python-matplotlib.spec
diff -u SPECS/python-matplotlib.spec:1.20 SPECS/python-matplotlib.spec:1.21
--- SPECS/python-matplotlib.spec:1.20	Sat Dec 27 20:34:00 2008
+++ SPECS/python-matplotlib.spec	Sat Dec 27 21:42:39 2008
@@ -7,7 +7,7 @@
 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
@@ -23,7 +23,13 @@
 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
@@ -48,7 +54,8 @@
 %setup -q -n %{module}-%{version}
 
 %build
-python setup.py build
+export CFLAGS="%{rpmcflags}"
+%{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -57,7 +64,9 @@
 	--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
@@ -74,21 +83,12 @@
 %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
@@ -100,6 +100,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2008/12/27 20:42:39  matkor
+- Release 1. More BRs
+
 Revision 1.20  2008/12/27 19:34:00  matkor
 - Updated to 0.98.5.2.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/python-matplotlib.spec?r1=1.20&r2=1.21&f=u