From 93fb90b936c1ee7bb7490a663ba92b18eb04354e Mon Sep 17 00:00:00 2001
From: Jef Spaleta <jspaleta@fedoraproject.org>
Date: Jun 24 2010 17:14:36 +0000
Subject: - Backport fix for doublefree situation from upstream trunk, BZ 607683.


---

diff --git a/numpy.spec b/numpy.spec
index 70a156e..9af627a 100644
--- a/numpy.spec
+++ b/numpy.spec
@@ -4,7 +4,7 @@
 
 Name:           numpy
 Version:        1.3.0
-Release:        8%{?dist}
+Release:        9%{?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} \
@@ -122,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jun 24 2010 Jef Spaleta <jspaleta@fedoraproject.org> 1.3.0-9
+- Backport fix for doublefree situation from upstream trunk, BZ 607683.
+
 * Mon Apr 26 2010 Jon Ciesla <limb@jcomserv.net> 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..73c455a
--- /dev/null
+++ b/numpy_doublefree.patch
@@ -0,0 +1,10 @@
++++ numpy/core/src/arrayobject.c	2009-04-05 00:19:55.000000000 -0800
+--- numpy/core/src/arrayobject.c.new	2010-06-24 08:47:52.271457871 -0800
+@@ -3527,6 +3527,7 @@
+ #define SET(op)   temp=PyDict_GetItemString(dict, #op); \
+     if (temp != NULL) {                                 \
+         if (!(PyCallable_Check(temp))) return -1;       \
++        Py_INCREF(temp);                                  \
+         Py_XDECREF(n_ops.op);                           \
+         n_ops.op = temp;                                \
+     }