rpms/ScientificPython/devel ScientificPython.spec,1.15,1.16

[Jef Spaleta]

Author: jspaleta

Update of /cvs/pkgs/rpms/ScientificPython/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11616

Modified Files:
	ScientificPython.spec 
Log Message:
* Sun Mar 1 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 2.8-2
- Fixed BuildRequires to reference numpy instead of numeric



Index: ScientificPython.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ScientificPython/devel/ScientificPython.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ScientificPython.spec	1 Mar 2009 19:02:34 -0000	1.15
+++ ScientificPython.spec	2 Mar 2009 01:45:50 -0000	1.16
@@ -3,7 +3,7 @@
 
 Name:           ScientificPython
 Version:        2.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A collection of Python modules that are useful for scientific computing
 
 Group:          Development/Languages
@@ -16,8 +16,8 @@
 BuildRequires:  python-devel
 BuildRequires:  netcdf-devel 
 BuildRequires:  openmpi-devel 
-BuildRequires: python-numeric
-Requires: python-numeric 
+BuildRequires: numpy
+Requires: numpy
 
 %package devel
 Summary:        The development files for ScientificPython
@@ -80,9 +80,10 @@
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 export PYTHONPATH="$PYTHONPATH:$RPM_BUILD_ROOT/%{python_sitearch}/"
 export PYINCLUDE="$RPM_BUILD_ROOT/%{_includedir}/python%{pyver}/"
+export NUMPYINCLUDE="$RPM_BUILD_ROOT/%{python_sitearch}//numpy/core/include/"
 #cp -R %{_includedir}/python%{pyver}/* $PYINCLUDE
 cd Src/MPI/
-cat compile.py|sed -e 's/-I/-I$PYINCLUDE -I/' > compile-new.py
+cat compile.py|sed -e 's/-I/-I$PYINCLUDE -I$NUMPYINCLUDE -I/' > compile-new.py
 %{__python} compile-new.py
 mv mpipython $RPM_BUILD_ROOT/%{_bindir}/
 
@@ -154,6 +155,9 @@
 %doc Doc/Reference Examples Doc/BSP_Tutorial.pdf
 
 %changelog
+* Sun Mar 1 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 2.8-2
+- Fixed BuildRequires to reference numpy instead of numeric
+
 * Sun Mar 1 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 2.8-1
 - Latest upstream release