rpms/scipy/FC-6 scipy.spec,1.3,1.4

[Jef Spaleta (jspaleta)]

Author: jspaleta

Update of /cvs/extras/rpms/scipy/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16342

Modified Files:
	scipy.spec 
Log Message:
remove arch specific optimizations


Index: scipy.spec
===================================================================
RCS file: /cvs/extras/rpms/scipy/FC-6/scipy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scipy.spec	25 Feb 2007 19:27:47 -0000	1.3
+++ scipy.spec	14 Apr 2007 11:40:53 -0000	1.4
@@ -3,7 +3,7 @@
 Summary: Scipy: array processing for numbers, strings, records, and objects
 Name: scipy
 Version: 0.5.2
-Release: 1%{?dist}
+Release: 1.1%{?dist}
 
 Group: Development/Libraries
 License: BSD
@@ -13,8 +13,11 @@
 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 @@
 %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,9 @@
 
 
 %changelog
+* Sat Apr 14 2007 Jef Spaleta <jspaleta at gmail.com> - 0.5.2-1.1
+- remove arch specific optimizations
+
 * Wed Feb 21 2007 Jef Spaleta <jspaleta at gmail.com> - 0.5.2-1
 - Update for new upstream release