rpms/numpy/devel numpy-0.9.4-f2pynumpy.patch, NONE, 1.1 numpy-0.9.4-gfortran.patch, NONE, 1.1 numpy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Ignacio Vazquez-Abrams (ivazquez)
fedora-extras-commits at redhat.com
Sat Feb 4 05:46:41 UTC 2006
Author: ivazquez
Update of /cvs/extras/rpms/numpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17343/devel
Modified Files:
.cvsignore sources
Added Files:
numpy-0.9.4-f2pynumpy.patch numpy-0.9.4-gfortran.patch
numpy.spec
Log Message:
auto-import numpy-0.9.4-1 on branch devel from numpy-0.9.4-1.src.rpm
numpy-0.9.4-f2pynumpy.patch:
--- NEW FILE numpy-0.9.4-f2pynumpy.patch ---
--- 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
[<options>] <fortran files> [[[only:]||[skip:]] <fortran functions> ] [: <fortran files> ...]
(2) To compile fortran files and build extension modules:
-.B f2py
+.B f2py.numpy
-c [<options>, <config_fc options>, <extra options>] <fortran files>
(3) To generate signature files:
-.B f2py
+.B f2py.numpy
-h <filename.pyf> ...< same options as in (1) >
.SH DESCRIPTION
This program generates a Python C/API file (<modulename>module.c)
@@ -44,7 +44,7 @@
Get back to <fortran files> mode.
.TP
.B \-m <modulename>
-Name of the module; f2py generates a Python/C API file
+Name of the module; f2py.numpy generates a Python/C API file
<modulename>module.c or extension module <modulename>. Default is
\'untitled\'.
.TP
@@ -53,7 +53,7 @@
assumed with -h key, and --no-lower without -h key.
.TP
.B \-\-build\-dir <dirname>
-All f2py generated files are created in <dirname>. Default is tempfile.mktemp().
+All f2py.numpy generated files are created in <dirname>. 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
numpy-0.9.4-gfortran.patch:
--- NEW FILE numpy-0.9.4-gfortran.patch ---
--- 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<version>[^\s*\)]+)'
+# version_pattern = r'GNU Fortran 95 \(GCC (?P<version>[^\s*\)]+)'
+ version_pattern = r'GNU Fortran 95 \(GCC\)?\s*(?P<version>[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"]
--- NEW FILE numpy.spec ---
%{!?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 <ivazquez at ivazquez.net> 0.9.4-1
- Initial RPM release
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/numpy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 4 Feb 2006 05:45:00 -0000 1.1
+++ .cvsignore 4 Feb 2006 05:46:41 -0000 1.2
@@ -0,0 +1 @@
+numpy-0.9.4.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/numpy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 4 Feb 2006 05:45:00 -0000 1.1
+++ sources 4 Feb 2006 05:46:41 -0000 1.2
@@ -0,0 +1 @@
+104ef1beb4b0182be52e2c0849305427 numpy-0.9.4.tar.gz
More information about the fedora-extras-commits
mailing list