From 7f4fb22c5b6214a14bc2c02b9504daca4570d664 Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Jul 22 2010 23:31:12 +0000 Subject: actually add the patch this time --- diff --git a/numpy-1.4.1-remove-PyOS_ascii_strtod.patch b/numpy-1.4.1-remove-PyOS_ascii_strtod.patch new file mode 100644 index 0000000..7f09e0b --- /dev/null +++ b/numpy-1.4.1-remove-PyOS_ascii_strtod.patch @@ -0,0 +1,27 @@ +diff -up numpy-1.4.1/numpy/core/src/multiarray/numpyos.c.remove-PyOS_ascii_strtod numpy-1.4.1/numpy/core/src/multiarray/numpyos.c +--- numpy-1.4.1/numpy/core/src/multiarray/numpyos.c.remove-PyOS_ascii_strtod 2010-07-22 19:15:18.846696632 -0400 ++++ numpy-1.4.1/numpy/core/src/multiarray/numpyos.c 2010-07-22 19:16:24.454744969 -0400 +@@ -506,7 +506,11 @@ NumPyOS_ascii_strtod(const char *s, char + } + memcpy(buffer, s, n); + buffer[n] = '\0'; ++#if PY_VERSION_HEX >= 0x02070000 ++ result = PyOS_string_to_double(buffer, &q, NULL); ++#else + result = PyOS_ascii_strtod(buffer, &q); ++#endif + if (endptr != NULL) { + *endptr = (char*)(s + (q - buffer)); + } +@@ -515,7 +519,11 @@ NumPyOS_ascii_strtod(const char *s, char + } + /* End of ##2 */ + ++#if PY_VERSION_HEX >= 0x02070000 ++ return PyOS_string_to_double(s, endptr, NULL); ++#else + return PyOS_ascii_strtod(s, endptr); ++#endif + } + + diff --git a/numpy.spec b/numpy.spec index 06bf632..d8768d9 100644 --- a/numpy.spec +++ b/numpy.spec @@ -4,7 +4,7 @@ Name: numpy Version: 1.4.1 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 Summary: A fast multidimensional array facility for Python @@ -133,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jul 22 2010 David Malcolm - 1:1.4.1-6 +- actually add the patch this time + * Thu Jul 22 2010 David Malcolm - 1:1.4.1-5 - fix segfault within %check on 2.7 (patch 2)