diff --git a/.cvsignore b/.cvsignore index ddf3518..a03a2ed 100644 --- a/.cvsignore +++ b/.cvsignore @@ -2,3 +2,4 @@ numpy-0.9.6.tar.gz numpy-0.9.8.tar.gz numpy-1.0.tar.gz numpy-1.0.1.tar.gz +numpy-1.0.2.tar.gz diff --git a/numpy-1.0-gfortran.patch b/numpy-1.0-gfortran.patch index 982bbc7..1268942 100644 --- a/numpy-1.0-gfortran.patch +++ b/numpy-1.0-gfortran.patch @@ -10,22 +10,6 @@ diff -ur numpy-1.0.orig/numpy/distutils/fcompiler/gnu.py numpy-1.0/numpy/distuti 'archiver' : ["ar", "-cr"], 'ranlib' : ["ranlib"], 'linker_exe' : [fc_exe, "-g", "-Wall"] -@@ -247,12 +247,14 @@ class GnuFCompiler(FCompiler): - class Gnu95FCompiler(GnuFCompiler): - - compiler_type = 'gnu95' -- version_match = simple_version_match(start='GNU Fortran 95') -+ version_match = simple_version_match(start='GNU Fortran (95|\(GCC\))') - - # 'gfortran --version' results: - # Debian: GNU Fortran 95 (GCC 4.0.3 20051023 (prerelease) (Debian 4.0.2-3)) - # OS X: GNU Fortran 95 (GCC) 4.1.0 - # GNU Fortran 95 (GCC) 4.2.0 20060218 (experimental) -+ # GNU Fortran (GCC) 4.3.0 20070316 (experimental) -+ # Red Hat: GNU Fortran (GCC) 4.1.2 20070403 (Red Hat 4.1.2-8) - - for fc_exe in map(find_executable,['gfortran','f95']): - if os.path.isfile(fc_exe): @@ -257,7 +257,7 @@ 'compiler_f77' : [fc_exe,"-Wall","-ffixed-form","-fno-second-underscore"], 'compiler_f90' : [fc_exe,"-Wall","-fno-second-underscore"], diff --git a/numpy.spec b/numpy.spec index 4542538..a22634b 100644 --- a/numpy.spec +++ b/numpy.spec @@ -3,8 +3,8 @@ %{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]' || echo "2.3")} Name: numpy -Version: 1.0.1 -Release: 4%{?dist} +Version: 1.0.2 +Release: 1%{?dist} Summary: A fast multidimensional array facility for Python Group: Development/Languages @@ -13,7 +13,6 @@ URL: http://numeric.scipy.org/ Source0: http://dl.sourceforge.net/numpy/%{name}-%{version}.tar.gz Patch0: numpy-1.0.1-f2py.patch Patch1: numpy-1.0-gfortran.patch -Patch2: numpy-1.0.1-cpuinfo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel atlas-devel blas-devel lapack-devel python-setuptools gcc-gfortran @@ -37,7 +36,6 @@ this package is a version of f2py that works properly with NumPy. %setup -q %patch0 -p1 -b .f2py %patch1 -p1 -b .gfortran -%patch2 -p1 -b .cpuinfo %build env ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} \ @@ -76,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/%{name} %changelog +* Mon May 14 2007 Jarod Wilson 1.0.2-1 +- New upstream release + * Tue Apr 17 2007 Jarod Wilson 1.0.1-4 - Update gfortran patch to recognize latest gfortran f95 support - Resolves rhbz#236444 diff --git a/sources b/sources index f1ab7be..708368e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -13a29244cbe03e0d45e56d8d90ecb55d numpy-1.0.1.tar.gz +8be83678056ae31bfe641d35bbc181f4 numpy-1.0.2.tar.gz