revert to f77 due to issue with numpy in development

This commit is contained in:
Jef Spaleta 2007-04-14 11:47:08 +00:00
parent e42f289bad
commit 2e6656edff

View File

@ -3,7 +3,7 @@
Summary: Scipy: array processing for numbers, strings, records, and objects Summary: Scipy: array processing for numbers, strings, records, and objects
Name: scipy Name: scipy
Version: 0.5.2 Version: 0.5.2
Release: 1%{?dist} Release: 2%{?dist}
Group: Development/Libraries Group: Development/Libraries
License: BSD License: BSD
@ -13,8 +13,11 @@ Source0: http://prdownloads.sourceforge.net/scipy/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: numpy, python-devel BuildRequires: numpy, python-devel
BuildRequires: fftw-devel, blas-devel, lapack-devel, gcc-gfortran BuildRequires: fftw-devel, blas-devel, lapack-devel
#BuildRequires: gcc-gfortran
# numpy is not correctly detecting gfortran in development tree
# reverting to f77 for the time being in devel
BuildRequires: compat-gcc-34-g77
Requires: numpy, python Requires: numpy, python
@ -34,11 +37,13 @@ basic linear algebra and random number generation.
%setup -q %setup -q
%build %build
env CFLAGS="$RPM_OPT_FLAGS" ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} python setup.py config_fc --fcompiler=gnu95 build env CFLAGS="$RPM_OPT_FLAGS" ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} python setup.py config_fc --fcompiler=gnu95 --noarch build
#env CFLAGS="$RPM_OPT_FLAGS" ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} python setup.py config_fc --fcompiler=gnu --f77flags="$RPM_OPT_FLAGS" build
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
env CFLAGS="$RPM_OPT_FLAGS" ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} python setup.py config_fc --fcompiler=gnu95 install --root=$RPM_BUILD_ROOT env CFLAGS="$RPM_OPT_FLAGS" ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} python setup.py install --root=$RPM_BUILD_ROOT
%clean %clean
@ -53,6 +58,12 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Sat Apr 14 2007 Jef Spaleta <jspaleta@gmail.com> - 0.5.2-2
- revert to f77 due to issue with numpy in development
* Sat Apr 14 2007 Jef Spaleta <jspaleta@gmail.com> - 0.5.2-1.1
- remove arch specific optimizations
* Wed Feb 21 2007 Jef Spaleta <jspaleta@gmail.com> - 0.5.2-1 * Wed Feb 21 2007 Jef Spaleta <jspaleta@gmail.com> - 0.5.2-1
- Update for new upstream release - Update for new upstream release