rpms/numpy/devel numpy-1.0.1-f2py.patch, NONE, 1.1 numpy.spec, 1.11, 1.12 numpy-0.9.4-f2pynumpy.patch, 1.1, NONE

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/extras/rpms/numpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11607

Modified Files:
	numpy.spec 
Added Files:
	numpy-1.0.1-f2py.patch 
Removed Files:
	numpy-0.9.4-f2pynumpy.patch 
Log Message:
- Per discussion w/Jose Matos, Obsolete/Provide f2py, as the
  stand-alone one is no longer supported/maintained upstream



numpy-1.0.1-f2py.patch:

--- NEW FILE numpy-1.0.1-f2py.patch ---
--- 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


Index: numpy.spec
===================================================================
RCS file: /cvs/extras/rpms/numpy/devel/numpy.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- numpy.spec	13 Dec 2006 18:15:11 -0000	1.11
+++ numpy.spec	4 Jan 2007 16:39:26 -0000	1.12
@@ -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 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .f2pynumpy
+%patch0 -p1 -b .f2py
 %patch1 -p1 -b .gfortran
 
 %build
@@ -49,9 +52,10 @@
 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 @@
 %{python_sitearch}/%{name}
 
 %changelog
+* Thu Jan 04 2007 Jarod Wilson <jwilson at 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 at redhat.com> 1.0.1-1
 - New upstream release
 


--- numpy-0.9.4-f2pynumpy.patch DELETED ---