- Per discussion w/Jose Matos, Obsolete/Provide f2py, as the stand-alone

one is no longer supported/maintained upstream
2007-01-04 16:39:26 +00:00 · 2007-01-04 16:39:26 +00:00 · 799f46ddff
commit 799f46ddff
parent bde3bd6a52
3 changed files with 40 additions and 89 deletions
--- a/numpy-0.9.4-f2pynumpy.patch
+++ b/numpy-0.9.4-f2pynumpy.patch
@ -1,84 +0,0 @@
--- 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
--- a/numpy-1.0.1-f2py.patch
+++ b/numpy-1.0.1-f2py.patch
@ -0,0 +1,27 @@
+--- numpy-1.0.1/numpy/f2py/f2py.1.f2pynumpy	2007-01-03 23:07:33.000000000 -0500
+++ numpy-1.0.1/numpy/f2py/f2py.1	2007-01-03 23:10:00.000000000 -0500
+@@ -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
--- a/numpy.spec
+++ b/numpy.spec
@ -4,19 +4,22 @@

 Name:           numpy
 Version:        1.0.1
-Release:        1%{?dist}
+Release:        2%{?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
-Patch0:         numpy-0.9.4-f2pynumpy.patch
+Patch0:         numpy-1.0.1-f2py.patch
 Patch1:         numpy-1.0-gfortran.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

 BuildRequires:  python-devel atlas-devel blas-devel lapack-devel python-setuptools gcc-gfortran

+Provides:       f2py
+Obsoletes:      f2py <= 2.45.241_1926
+
 %description
 NumPy is a general-purpose array-processing package designed to
 efficiently manipulate large multi-dimensional arrays of arbitrary
@ -31,7 +34,7 @@ this package is a version of f2py that works properly with NumPy.

 %prep
 %setup -q
-%patch0 -p1 -b .f2pynumpy
+%patch0 -p1 -b .f2py
 %patch1 -p1 -b .gfortran

 %build
@ -49,9 +52,10 @@ env ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} \
 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
+install -D -p -m 0644 f2py.1 $RPM_BUILD_ROOT%{_mandir}/man1/f2py.1
 pushd $RPM_BUILD_ROOT%{_bindir} &> /dev/null
-mv -f f2py f2py.numpy
+# symlink for anyone who was using f2py.numpy
+ln -s f2py f2py.numpy
 popd &> /dev/null

 %check ||:
@ -70,6 +74,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/%{name}

 %changelog
+* Thu Jan 04 2007 Jarod Wilson <jwilson@redhat.com> 1.0.1-2
+- Per discussion w/Jose Matos, Obsolete/Provide f2py, as the
+  stand-alone one is no longer supported/maintained upstream
+
 * Wed Dec 13 2006 Jarod Wilson <jwilson@redhat.com> 1.0.1-1
 - New upstream release