From 2a3713a7d40a4ff04752e4a9a2310dc3ac0707ec Mon Sep 17 00:00:00 2001
From: Jef Spaleta <jspaleta@fedoraproject.org>
Date: Thu, 2 Oct 2008 17:22:00 +0000
Subject: [PATCH] - include missing setup files for stsci module

---
 scipy.spec              | 12 +++++++++++-
 stsci_convolve_setup.py | 26 ++++++++++++++++++++++++++
 stsci_image_setup.py    | 21 +++++++++++++++++++++
 3 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 stsci_convolve_setup.py
 create mode 100755 stsci_image_setup.py

diff --git a/scipy.spec b/scipy.spec
index bda7ed0..4c4f4fb 100644
--- a/scipy.spec
+++ b/scipy.spec
@@ -3,12 +3,16 @@
 Summary: Scipy: Scientific Tools for Python
 Name: scipy
 Version: 0.6.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 Group: Development/Libraries
 License: BSD and LGPLv2+
 Url: http://www.scipy.org
 Source0: http://prdownloads.sourceforge.net/scipy/%{name}-%{version}.tar.gz
+# Missing setup.py files which control the build of this module
+# These should be removed as soon as upstream pushes a release with this fixed
+Source1: stsci_image_setup.py
+Source2: stsci_convolve_setup.py
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -44,6 +48,9 @@ include_dirs = /usr/include/suitesparse:/usr/include/ufsparse
 umfpack_libs = umfpack
 EOF
 
+cp %{SOURCE1} scipy/stsci/image/
+cp %{SOURCE2} scipy/stsci/convolve/
+
 %build
 env CFLAGS="$RPM_OPT_FLAGS" ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} python setup.py config_fc --fcompiler=gnu95 --noarch build
 
@@ -66,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 02 2008 Jef Spaleta <jspaleta@fedoraproject.org> - 0.6.0-6
+- include missing setup files for stsci module
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.6.0-5
 - Autorebuild for GCC 4.3
 
diff --git a/stsci_convolve_setup.py b/stsci_convolve_setup.py
new file mode 100644
index 0000000..0fa3e9f
--- /dev/null
+++ b/stsci_convolve_setup.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python
+import numpy
+
+def configuration(parent_package='',top_path=None):
+    from numpy.distutils.misc_util import Configuration
+    config = Configuration('convolve',parent_package,top_path,
+                           package_path='lib')
+
+    config.add_extension('_correlate',
+                         sources=["src/_correlatemodule.c"],
+                         define_macros = [('NUMPY', '1')],
+                         include_dirs = [numpy.get_numarray_include()])
+    config.add_extension('_lineshape',
+                         sources=["src/_lineshapemodule.c"],
+                         define_macros = [('NUMPY', '1')],
+                         include_dirs = [numpy.get_numarray_include()])
+    return config
+
+if __name__ == "__main__":
+    from numpy.distutils.core import setup
+    config = configuration(top_path='').todict()
+    setup(author='Todd Miller',
+          author_email = 'help@stsci.edu',
+          description = 'image array convolution functions',
+          version = '2.0',
+          **config)
diff --git a/stsci_image_setup.py b/stsci_image_setup.py
new file mode 100755
index 0000000..de403d5
--- /dev/null
+++ b/stsci_image_setup.py
@@ -0,0 +1,21 @@
+#!/usr/bin/env python
+import numpy
+
+def configuration(parent_package='',top_path=None):
+    from numpy.distutils.misc_util import Configuration
+    config = Configuration('image',parent_package,top_path,
+                           package_path='lib')
+    config.add_extension('_combine',
+                         sources=["src/_combinemodule.c"],
+                         define_macros = [('NUMPY', '1')],
+                         include_dirs = [numpy.get_numarray_include()])
+    return config
+
+if __name__ == "__main__":
+    from numpy.distutils.core import setup
+    config = configuration(top_path='').todict()
+    setup(author='Todd Miller',
+          author_email = 'help@stsci.edu',
+          description = 'image array manipulation functions',
+          version = '2.0',
+          **config)