From 6e2acbbf1419e6d6892e6bdd87a8f12faa66642b403337b776dc1e47b53a9b72 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Mon, 6 Sep 2010 09:39:05 +0000
Subject: [PATCH] Accepting request 47219 from devel:languages:python

Copy from devel:languages:python/python-numpy based on submit request 47219 from user coolo

OBS-URL: https://build.opensuse.org/request/show/47219
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-numpy?expand=0&rev=9
---
 npy_cpu.diff         | 11 -----------
 numpy-1.3.0.tar.bz2  |  3 ---
 numpy-1.5.0.tar.bz2  |  3 +++
 numpy-buildfix.patch | 21 ++++++++++++++++++---
 python-numpy.changes | 15 +++++++++++++++
 python-numpy.spec    |  8 +++-----
 6 files changed, 39 insertions(+), 22 deletions(-)
 delete mode 100644 npy_cpu.diff
 delete mode 100644 numpy-1.3.0.tar.bz2
 create mode 100644 numpy-1.5.0.tar.bz2

diff --git a/npy_cpu.diff b/npy_cpu.diff
deleted file mode 100644
index a4a945f..0000000
--- a/npy_cpu.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- numpy/core/include/numpy/npy_cpu.h.orig	2010-05-31 06:37:01.000000000 +0000
-+++ numpy/core/include/numpy/npy_cpu.h	2010-05-31 06:52:40.000000000 +0000
-@@ -42,7 +42,7 @@
-     #define NPY_CPU_S390
- #elif defined(__ia64)
-     #define NPY_CPU_IA64
--#elif defined(__parisc__)
-+#elif defined(__parisc__) || defined(__hppa)
-     /* XXX: Not sure about this one... */
-     #define NPY_CPU_PARISC
- #else
diff --git a/numpy-1.3.0.tar.bz2 b/numpy-1.3.0.tar.bz2
deleted file mode 100644
index 19a8449..0000000
--- a/numpy-1.3.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b3019d980110e298536c4bcec99240cca0d55963b4ecc5d02415611e3d1238b6
-size 1666680
diff --git a/numpy-1.5.0.tar.bz2 b/numpy-1.5.0.tar.bz2
new file mode 100644
index 0000000..b946568
--- /dev/null
+++ b/numpy-1.5.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6c208a3b1d2929aa039946d277fdb64af6a6d6c799d0e4cee5b1f52d661db1be
+size 1910286
diff --git a/numpy-buildfix.patch b/numpy-buildfix.patch
index e5a565b..8f17440 100644
--- a/numpy-buildfix.patch
+++ b/numpy-buildfix.patch
@@ -1,6 +1,8 @@
---- numpy/distutils/command/install.py
-+++ numpy/distutils/command/install.py
-@@ -58,7 +58,7 @@
+Index: numpy/distutils/command/install.py
+===================================================================
+--- numpy/distutils/command/install.py.orig	2010-08-04 12:53:20.000000000 +0200
++++ numpy/distutils/command/install.py	2010-09-06 10:29:18.119261319 +0200
+@@ -64,7 +64,7 @@ class install(old_install):
              need_rewrite = False
              for l in f.readlines():
                  l = l.rstrip()
@@ -9,3 +11,16 @@
                      need_rewrite = True
                      l = '"%s"' % (l)
                  lines.append(l)
+Index: numpy/distutils/command/autodist.py
+===================================================================
+--- numpy/distutils/command/autodist.py.orig	2010-08-04 12:53:20.000000000 +0200
++++ numpy/distutils/command/autodist.py	2010-09-06 10:29:31.835385151 +0200
+@@ -28,7 +28,7 @@ def check_compiler_gcc4(cmd):
+     """Return True if the C compiler is GCC 4.x."""
+     cmd._check_compiler()
+     body = """
+-int
++void
+ main()
+ {
+ #ifndef __GNUC__ && (__GNUC__ >= 4)
diff --git a/python-numpy.changes b/python-numpy.changes
index abf45dd..5a5f31d 100644
--- a/python-numpy.changes
+++ b/python-numpy.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon Sep  6 08:32:07 UTC 2010 - coolo@novell.com
+
+- update to 1.5.0 to fix build against python 2.7
+
+ highlights 1.3 -> 1.4:
+  * New datetime dtype support to deal with dates in arrays
+  * Faster import time
+  * Extended array wrapping mechanism for ufuncs
+  * New Neighborhood iterator (C-level only)
+  * C99-like complex functions in npymath
+
+ highlights 1.4 -> 1.5:
+  * support for python3 and python 2.7
+
 -------------------------------------------------------------------
 Mon May 31 07:14:03 UTC 2010 - bg@novell.com
 
diff --git a/python-numpy.spec b/python-numpy.spec
index aa6bad2..d70c944 100644
--- a/python-numpy.spec
+++ b/python-numpy.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package python-numpy (Version 1.3.0)
+# spec file for package python-numpy (Version 1.5.0)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -21,8 +21,8 @@ Name:           python-numpy
 Summary:        NumPy: array processing for numbers, strings, records and objects
 License:        BSD
 Group:          Development/Libraries/Python
-Version:        1.3.0
-Release:        3
+Version:        1.5.0
+Release:        1
 Url:            http://sourceforge.net/projects/numpy
 Provides:       numpy = %version-%release
 %if 0%{?fedora_version} == 0
@@ -44,7 +44,6 @@ BuildRequires:  fdupes
 Source:         numpy-%{version}.tar.bz2
 Source1:        python-numpy-rpmlintrc
 Patch1:         numpy-buildfix.patch
-Patch2:         npy_cpu.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -76,7 +75,6 @@ This package contains files for developing applications using numpy.
 %prep
 %setup -q -n numpy-%{version}
 %patch1 -p0
-%patch2
 for i in $(find . -name "*.py"); do 
 	sed -i 's|^.*env python$|#!%{_bindir}/python|g' $i
 done