diff --git a/.cvsignore b/.cvsignore index f584dcf..b7b1ea0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -numpy-1.4.0.tar.gz +numpy-1.4.1.tar.gz diff --git a/numpy.spec b/numpy.spec index 70a156e..df3a192 100644 --- a/numpy.spec +++ b/numpy.spec @@ -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 1.4.1-1 +- New upstream release. Include backported doublefree patch + * Mon Apr 26 2010 Jon Ciesla 1.3.0-8 - Moved distutils back to the main package, BZ 572820. diff --git a/numpy_doublefree.patch b/numpy_doublefree.patch new file mode 100644 index 0000000..c52ac57 --- /dev/null +++ b/numpy_doublefree.patch @@ -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; \ diff --git a/sources b/sources index 9e496b8..02bba2e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3f7773ff0971a5ebb8591536d8ec7bd6 numpy-1.3.0.tar.gz +5c7b5349dc3161763f7f366ceb96516b numpy-1.4.1.tar.gz