- New upstream release. Include backported doublefree patch

This commit is contained in:
Jef Spaleta 2010-06-25 08:31:45 +00:00
parent 6ffeefc58d
commit 6873c2fa45
4 changed files with 22 additions and 9 deletions

View File

@ -1 +1 @@
numpy-1.4.0.tar.gz
numpy-1.4.1.tar.gz

View File

@ -3,8 +3,8 @@
%{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]' || echo "2.3")}
Name: numpy
Version: 1.3.0
Release: 8%{?dist}
Version: 1.4.1
Release: 1%{?dist}
Epoch: 1
Summary: A fast multidimensional array facility for Python
@ -13,7 +13,7 @@ License: BSD
URL: http://numeric.scipy.org/
Source0: http://downloads.sourceforge.net/numpy/%{name}-%{version}.tar.gz
Patch0: numpy-1.0.1-f2py.patch
#Patch1: numpy-arm.patch
Patch1: numpy_doublefree.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel lapack-devel python-setuptools gcc-gfortran atlas-devel python-nose
@ -45,7 +45,7 @@ This package includes a version of f2py that works properly with NumPy.
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .f2py
#%patch1 -p1 -b .arm
%patch1 -p0
%build
env ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} \
@ -105,9 +105,9 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitearch}/%{name}/random
%{python_sitearch}/%{name}/testing
%{python_sitearch}/%{name}/tests
#%{python_sitearch}/%{name}/compat
#%{python_sitearch}/%{name}/matrixlib
#%{python_sitearch}/%{name}/polynomial
%{python_sitearch}/%{name}/compat
%{python_sitearch}/%{name}/matrixlib
%{python_sitearch}/%{name}/polynomial
%if 0%{?fedora} >= 9
%{python_sitearch}/%{name}-*.egg-info
%endif
@ -122,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Thu Jun 24 2010 Jef Spaleta <jspaleta@fedoraprject.org> 1.4.1-1
- New upstream release. Include backported doublefree patch
* Mon Apr 26 2010 Jon Ciesla <limb@jcomserv.net> 1.3.0-8
- Moved distutils back to the main package, BZ 572820.

10
numpy_doublefree.patch Normal file
View File

@ -0,0 +1,10 @@
Index: numpy/core/src/multiarray/number.c
===================================================================
--- numpy/core/src/multiarray/number.c (revision 7888)
+++ numpy/core/src/multiarray/number.c (revision 8364)
@@ -31,4 +31,5 @@
return -1; \
} \
+ Py_INCREF(temp); \
Py_XDECREF(n_ops.op); \
n_ops.op = temp; \

View File

@ -1 +1 @@
3f7773ff0971a5ebb8591536d8ec7bd6 numpy-1.3.0.tar.gz
5c7b5349dc3161763f7f366ceb96516b numpy-1.4.1.tar.gz