From 2e6656edff1847ebf612d4a23f525c6354a97930 Mon Sep 17 00:00:00 2001 From: Jef Spaleta Date: Sat, 14 Apr 2007 11:47:08 +0000 Subject: [PATCH] revert to f77 due to issue with numpy in development --- scipy.spec | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/scipy.spec b/scipy.spec index 6b01a49..a5a05e1 100644 --- a/scipy.spec +++ b/scipy.spec @@ -3,7 +3,7 @@ Summary: Scipy: array processing for numbers, strings, records, and objects Name: scipy Version: 0.5.2 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Libraries 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) 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 @@ -34,11 +37,13 @@ basic linear algebra and random number generation. %setup -q %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 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 @@ -53,6 +58,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Apr 14 2007 Jef Spaleta - 0.5.2-2 +- revert to f77 due to issue with numpy in development + +* Sat Apr 14 2007 Jef Spaleta - 0.5.2-1.1 +- remove arch specific optimizations + * Wed Feb 21 2007 Jef Spaleta - 0.5.2-1 - Update for new upstream release