rpms/numpy/FC-6 numpy-1.0.1-f2py.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 numpy.spec, 1.7, 1.8 sources, 1.6, 1.7 numpy-0.9.4-f2pynumpy.patch, 1.1, NONE

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/extras/rpms/numpy/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23172

Modified Files:
	.cvsignore numpy.spec sources 
Added Files:
	numpy-1.0.1-f2py.patch 
Removed Files:
	numpy-0.9.4-f2pynumpy.patch 
Log Message:
Bump to v1.0.1 and obsolete/provide f2py

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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/numpy/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Nov 2006 16:53:34 -0000	1.6
+++ .cvsignore	4 Jan 2007 19:50:34 -0000	1.7
@@ -1,3 +1,4 @@
 numpy-0.9.6.tar.gz
 numpy-0.9.8.tar.gz
 numpy-1.0.tar.gz
+numpy-1.0.1.tar.gz


Index: numpy.spec
===================================================================
RCS file: /cvs/extras/rpms/numpy/FC-6/numpy.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- numpy.spec	21 Nov 2006 16:53:34 -0000	1.7
+++ numpy.spec	4 Jan 2007 19:50:34 -0000	1.8
@@ -3,39 +3,42 @@
 %{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]' || echo "2.3")}
 
 Name:           numpy
-Version:        1.0
-Release:        1%{?dist}
+Version:        1.0.1
+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
 
-%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.
+Provides:       f2py
+Obsoletes:      f2py <= 2.45.241_1927
 
-This package also contains a version of f2py that works properly with it.
+%description
+NumPy is a general-purpose array-processing package designed to
+efficiently manipulate large multi-dimensional arrays of arbitrary
+records without sacrificing too much speed for small multi-dimensional
+arrays.  NumPy is built on the Numeric code base and adds features
+introduced by numarray as well as an extended C-API and the ability to
+create arrays of arbitrary type.
+
+There are also basic facilities for discrete fourier transform,
+basic linear algebra and random number generation. Also included in
+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
-ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} \
+env ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} \
     LAPACK=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" \
     %{__python} setup.py build
 
@@ -43,15 +46,16 @@
 rm -rf $RPM_BUILD_ROOT
 #%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 # skip-build currently broken, this works around it for now
-ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} \
+env ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} \
     LAPACK=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" \
     %{__python} setup.py install --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
+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,16 @@
 %{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
+
+* Tue Dec 12 2006 Jarod Wilson <jwilson at redhat.com> 1.0-2
+- Rebuild for python 2.5
+
 * Wed Oct 25 2006 Jarod Wilson <jwilson at redhat.com> 1.0-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/numpy/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	21 Nov 2006 16:53:34 -0000	1.6
+++ sources	4 Jan 2007 19:50:34 -0000	1.7
@@ -1 +1 @@
-47dd0daa82e7b3f0fe74b969b388d7b3  numpy-1.0.tar.gz
+13a29244cbe03e0d45e56d8d90ecb55d  numpy-1.0.1.tar.gz


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