[HippoDraw/f17] fix build with numpy

[Tom Callaway]

commit e408cda9cb89a27b1bdee8238b07b75ca1e16e3c
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Fri Mar 23 11:08:11 2012 -0400

    fix build with numpy

 HippoDraw-1.21.3-numpy.patch |   14 ++++++++++++++
 HippoDraw.spec               |   24 ++++++++++++++----------
 2 files changed, 28 insertions(+), 10 deletions(-)
---
diff --git a/HippoDraw-1.21.3-numpy.patch b/HippoDraw-1.21.3-numpy.patch
new file mode 100644
index 0000000..1ef3373
--- /dev/null
+++ b/HippoDraw-1.21.3-numpy.patch
@@ -0,0 +1,14 @@
+diff -up HippoDraw-1.21.3/python/PyDataSource.cxx.numpy HippoDraw-1.21.3/python/PyDataSource.cxx
+--- HippoDraw-1.21.3/python/PyDataSource.cxx.numpy	2012-03-23 10:53:55.844565155 -0400
++++ HippoDraw-1.21.3/python/PyDataSource.cxx	2012-03-23 10:54:15.674380505 -0400
+@@ -37,6 +37,10 @@ $Id: PyDataSource.cxx,v 1.65 2007/08/24
+ #include "numarray/num_util.h"
+ #endif
+ 
++#ifdef HAVE_NUMPY
++#include "numpy/oldnumeric.h"
++#endif
++
+ #ifdef HAVE_CFITSIO
+ #include "fits/FitsNTuple.h"
+ #endif
diff --git a/HippoDraw.spec b/HippoDraw.spec
index 51eacc8..51509ef 100644
--- a/HippoDraw.spec
+++ b/HippoDraw.spec
@@ -1,6 +1,6 @@
 Name:    HippoDraw
 Version: 1.21.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Interactive and Python scriptable data analysis application
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")}
@@ -15,10 +15,11 @@ Source0: ftp://ftp.slac.stanford.edu/users/pfkeb/hippodraw/%{name}-%{version}.ta
 Patch1: HippoDraw-1.21.1-gcc43.patch
 Patch2: HippoDraw-1.21.1-includes.patch
 Patch3: HippoDraw-gcc45.patch
+Patch4: HippoDraw-1.21.3-numpy.patch
 
 BuildRequires: cfitsio-devel qt3-devel desktop-file-utils doxygen graphviz
 BuildRequires: graphviz-gd
-BuildRequires: numpy
+BuildRequires: numpy boost-devel python-devel
 BuildRequires: tetex-latex tetex-dvips netpbm-progs ghostscript
 Requires:  tetex-latex tetex-dvips netpbm-progs ghostscript
 
@@ -30,9 +31,8 @@ Python extension module.
 %package python
 Summary: %{name} Python module
 Group: Development/Languages
-BuildRequires: boost-devel python-devel python-numarray
-Requires: %{name} = %{version}-%{release}
-Requires: python-numarray
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: numpy
 
 %description  python
 Provides Python module to use %{name} from Python scripts.
@@ -40,8 +40,8 @@ Provides Python module to use %{name} from Python scripts.
 %package devel
 Summary:  Library and header files for %{name} library
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: qt3-devel boost-devel cfitsio-devel python-numarray
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: qt3-devel boost-devel cfitsio-devel numpy
 
 %description devel
 The %{name}-devel package contains libraries and header files for
@@ -62,12 +62,13 @@ class library.  User documentation is part of the main package.
 %patch1 -p1 -b .gcc43
 %patch2 -p1 -b .includes
 %patch3 -p1 -b .gcc45
+%patch4 -p1 -b .numpy
 
 %build
 # Exclude or avoid packages that might be installed in /usr/local
 # Exclude wcslib that might be installed from rpm which is older version.
 %{configure} --without-wcslib-lib --without-minuit2-lib --without-root-lib\
-    --disable-rpath --with-boost-root=%{_prefix} --with-wcslib-include=no
+    --disable-rpath --with-boost-root=%{_prefix} --with-wcslib-include=no --enable-numpybuild
 make %{?_smp_mflags}
 make docs
 
@@ -136,8 +137,11 @@ touch --no-create %{_datadir}/icons/hicolor || :
 %{_datadir}/%{name}/examples
 
 %changelog
-* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.21.3-3
-- Rebuilt for c++ ABI breakage
+* Fri Mar 23 2012 Tom Callaway <spot at fedoraproject.org> - 1.21.3-4
+- fix build against numpy
+
+* Fri Feb 10 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 1.21.3-3
+- Fix sub package deps
 
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.21.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild