From c9d6362d1db5e0fe3dd92f285cb53cb7f41903a1 Mon Sep 17 00:00:00 2001 From: Ignacio Vazquez-Abrams Date: Feb 04 2006 05:46:41 +0000 Subject: auto-import numpy-0.9.4-1 on branch devel from numpy-0.9.4-1.src.rpm --- diff --git a/.cvsignore b/.cvsignore index e69de29..8fa9f60 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +numpy-0.9.4.tar.gz diff --git a/numpy-0.9.4-f2pynumpy.patch b/numpy-0.9.4-f2pynumpy.patch new file mode 100644 index 0000000..2b6b795 --- /dev/null +++ b/numpy-0.9.4-f2pynumpy.patch @@ -0,0 +1,84 @@ +--- numpy-0.9.2/numpy/f2py/f2py.1.f2pynumpy 2006-01-19 23:07:33.000000000 -0500 ++++ numpy-0.9.2/numpy/f2py/f2py.1 2006-01-19 23:10:00.000000000 -0500 +@@ -1,20 +1,20 @@ +-.TH "F2PY" 1 ++.TH "F2PY.NUMPY" 1 + .SH NAME +-f2py \- Fortran to Python interface generator ++f2py.numpy \- Fortran to Python interface generator + .SH SYNOPSIS + (1) To construct extension module sources: + +-.B f2py ++.B f2py.numpy + [] [[[only:]||[skip:]] ] [: ...] + + (2) To compile fortran files and build extension modules: + +-.B f2py ++.B f2py.numpy + -c [, , ] + + (3) To generate signature files: + +-.B f2py ++.B f2py.numpy + -h ...< same options as in (1) > + .SH DESCRIPTION + This program generates a Python C/API file (module.c) +@@ -44,7 +44,7 @@ + Get back to mode. + .TP + .B \-m +-Name of the module; f2py generates a Python/C API file ++Name of the module; f2py.numpy generates a Python/C API file + module.c or extension module . Default is + \'untitled\'. + .TP +@@ -53,7 +53,7 @@ + assumed with -h key, and --no-lower without -h key. + .TP + .B \-\-build\-dir +-All f2py generated files are created in . Default is tempfile.mktemp(). ++All f2py.numpy generated files are created in . Default is tempfile.mktemp(). + .TP + .B \-\-overwrite\-signature + Overwrite existing signature file. +@@ -95,10 +95,10 @@ + Run with extra verbosity. + .TP + .B \-v +-Print f2py version ID and exit. ++Print f2py.numpy version ID and exit. + .TP + .B \-\-include_paths path1:path2:... +-Search include files (that f2py will scan) from the given directories. ++Search include files (that f2py.numpy will scan) from the given directories. + .SH "CONFIG_FC OPTIONS" + The following options are effective only when -c switch is used. + .TP +@@ -180,11 +180,7 @@ + .SH REQUIREMENTS + Python 1.5.2 or higher (2.x is supported). + +-Numerical Python 13 or higher (20.x,21.x,22.x,23.x are supported). +- +-Optional Numarray 0.9 or higher partially supported. +- +-numpy_distutils from Scipy (can be downloaded from F2PY homepage) ++numpy_distutils from Numpy + .SH "SEE ALSO" + python(1) + .SH BUGS +@@ -200,10 +196,8 @@ + + Mailing list: http://cens.ioc.ee/mailman/listinfo/f2py-users/ + +-Scipy website: http://www.numpy.org ++Numpy website: http://numeric.scipy.org/ + .SH COPYRIGHT + Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Pearu Peterson + .SH LICENSE + NumPy License +-.SH VERSION +-2.45.241 diff --git a/numpy-0.9.4-gfortran.patch b/numpy-0.9.4-gfortran.patch new file mode 100644 index 0000000..50432a7 --- /dev/null +++ b/numpy-0.9.4-gfortran.patch @@ -0,0 +1,30 @@ +--- numpy-0.9.4/numpy/distutils/fcompiler/gnu.py.orig 2006-02-01 14:01:20.000000000 -0500 ++++ numpy-0.9.4/numpy/distutils/fcompiler/gnu.py 2006-02-01 17:28:33.000000000 -0500 +@@ -29,7 +29,7 @@ + 'compiler_f77' : [fc_exe,"-Wall","-fno-second-underscore"], + 'compiler_f90' : None, + 'compiler_fix' : None, +- 'linker_so' : [fc_exe,"-Wall"], ++ 'linker_so' : [fc_exe,"-shared", "-Wall"], + 'archiver' : ["ar", "-cr"], + 'ranlib' : ["ranlib"], + 'linker_exe' : [fc_exe,"-Wall"] +@@ -211,7 +211,8 @@ + class Gnu95FCompiler(GnuFCompiler): + + compiler_type = 'gnu95' +- version_pattern = r'GNU Fortran 95 \(GCC (?P[^\s*\)]+)' ++# version_pattern = r'GNU Fortran 95 \(GCC (?P[^\s*\)]+)' ++ version_pattern = r'GNU Fortran 95 \(GCC\)?\s*(?P[0-9.]+)' + + # 'gfortran --version' results: + # Debian: GNU Fortran 95 (GCC 4.0.3 20051023 (prerelease) (Debian 4.0.2-3)) +@@ -224,6 +225,6 @@ + 'compiler_f77' : [fc_exe,"-Wall","-ffixed-form","-fno-second-underscore"], + 'compiler_f90' : [fc_exe,"-Wall","-fno-second-underscore"], + 'compiler_fix' : [fc_exe,"-Wall","-ffixed-form","-fno-second-underscore"], +- 'linker_so' : [fc_exe,"-Wall"], ++ 'linker_so' : [fc_exe,"-shared", "-Wall"], + 'archiver' : ["ar", "-cr"], + 'ranlib' : ["ranlib"], + 'linker_exe' : [fc_exe,"-Wall"] diff --git a/numpy.spec b/numpy.spec new file mode 100644 index 0000000..12c93c9 --- /dev/null +++ b/numpy.spec @@ -0,0 +1,68 @@ +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + +Name: numpy +Version: 0.9.4 +Release: 1%{?dist} +Summary: A fast multidimensional array facility for Python + +Group: Development/Languages +License: BSD +URL: http://numeric.scipy.org/ +Source0: http://dl.sourceforge.net/numpy/%{name}-%{version}.tar.gz +Patch: numpy-0.9.4-f2pynumpy.patch +Patch1: numpy-0.9.4-gfortran.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: python-devel atlas-devel blas-devel lapack-devel python-setuptools gcc-gfortran +Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") + +%description +The Numeric Python extensions is a set of extensions to the Python programming +language which allows Python programmers to efficiently manipulate large sets +of objects organized in grid-like fashion. These sets of objects are called +arrays, and they can have any number of dimensions: one dimensional arrays are +similar to standard Python sequences, two-dimensional arrays are similar to +matrices from linear algebra. Note that one-dimensional arrays are also +different from any other Python sequence, and that two-dimensional matrices +are also different from the matrices of linear algebra. + +This package also contains a version of f2py that works properly with it. + +%prep +%setup -q +%patch -p1 -b .f2pynumpy +%patch1 -p1 -b .gfortran + +%build +BLAS=%{_libdir} LAPACK=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build + +%install +rm -rf $RPM_BUILD_ROOT +%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +rm -rf docs-f2py ; mv $RPM_BUILD_ROOT%{python_sitearch}/%{name}/f2py/docs docs-f2py +mv -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/f2py/f2py.1 f2py.1 +rm -rf doc ; mv -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/doc . +install -D -p -m 0644 f2py.1 $RPM_BUILD_ROOT%{_mandir}/man1/f2py.numpy.1 +pushd $RPM_BUILD_ROOT%{_bindir} &> /dev/null +mv -f f2py f2py.numpy +popd &> /dev/null + +%check ||: +pushd doc &> /dev/null +PYTHONPATH="$RPM_BUILD_ROOT%{python_sitearch}" %{__python} -c "import pkg_resources, numpy ; numpy.test(1, 1)" +popd &> /dev/null + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc docs-f2py doc/* LICENSE.txt +%{_bindir}/* +%{_mandir}/man*/* +%{python_sitearch}/%{name} + +%changelog +* Thu Feb 2 2006 Ignacio Vazquez-Abrams 0.9.4-1 +- Initial RPM release diff --git a/sources b/sources index e69de29..8661184 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +104ef1beb4b0182be52e2c0849305427 numpy-0.9.4.tar.gz