--- a/ChangeLog	Thu Nov 01 12:50:42 2007 +0000
+++ b/ChangeLog	Fri Nov 02 01:39:08 2007 +0000
@@ -1,3 +1,13 @@
+2007-11-01  Brian Cameron  <[email protected]>
+
+	* SUNWPython-extra.spec, base-specs/numpy.spec:  Add numpy to
+	  SUNWPython-extra package to add numerical processing extensions
+	  to Python.
+	* base-spects/pygtk2.spec, patches/pygtk2-02-numpy-r2808.diff.  This
+	  patch is based on the patch pygtk_r2808_patch_for_numpy found at
+	  this URL - http://www.scipy.org/Porting_to_NumPy.
+	* base-specs/pyxml.spec: Fix Source URL.
+
 2007-11-01  Damien Carbery <[email protected]>
 
 	* SUNWpcre.spec: Set --norunpath so that internal dirs not in the

--- a/SUNWPython-extra.spec	Thu Nov 01 12:50:42 2007 +0000
+++ b/SUNWPython-extra.spec	Fri Nov 02 01:39:08 2007 +0000
@@ -13,6 +13,7 @@
 %use pyrex = Pyrex.spec
 %use pyxml = pyxml.spec
 %use elementtree = elementtree.spec
+%use numpy = numpy.spec
 
 Name:                    SUNWPython-extra
 Summary:                 Supplemental Python libraries and utilities
@@ -31,12 +32,14 @@
 %pyrex.prep -d %name-%version
 %pyxml.prep -d %name-%version
 %elementtree.prep -d %name-%version
+%numpy.prep -d %name-%version
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %pyrex.install -d %name-%version
 %pyxml.install -d %name-%version
 %elementtree.install -d %name-%version
+%numpy.install -d %name-%version
 
 %{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
 
@@ -52,6 +55,8 @@
 
 
 %changelog
+* Thu Oct 25 2007 - [email protected]
+- Add numpy to add numerical processing extensions to Python.
 * Thu Jul 27 2006 - [email protected]
 - add elementtree
 * Thu Oct 27 2005 - [email protected]

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/base-specs/numpy.spec	Fri Nov 02 01:39:08 2007 +0000
@@ -0,0 +1,56 @@
+#
+# spec file for package numpy
+#
+# includes module(s): numpy
+#
+# Copyright (c) 2005 Sun Microsystems, Inc.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+# Owner: laca
+#
+%define pythonver 2.4
+
+Name:         numpy
+License:      CNRI Python License
+Group:        Development/Languages/Python
+Version:      1.0.3.1
+Release:      1
+Distribution: Java Desktop System
+Vendor:       Sun Microsystems, Inc.
+Summary:      Python XML module
+Source:       http://internap.dl.sourceforge.net/sourceforge/numpy/numpy-%{version}.tar.gz
+URL:          http://numpy.scipy.org/
+BuildRoot:    %{_tmppath}/%{name}-%{version}-build
+Docdir:       %{_defaultdocdir}/doc
+Autoreqprov:  off
+Prereq:       /sbin/ldconfig
+Requires:     python >= %{pythonver}
+BuildRequires: python-devel >= %{pythonver}
+
+%description
+Numerical processing extensions to the python programming language.
+
+%prep
+%setup -q -n numpy-%{version}
+
+%install
+python setup.py install --prefix=$RPM_BUILD_ROOT%{_prefix}
+
+# move to vendor-packages
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages
+mv $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages/* \
+   $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages/
+rmdir $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-, root, root)
+%{_bindir}
+%{_libdir}/python?.?/vendor-packages
+
+%changelog
+* Thu Oct 25 2007 - [email protected]
+- initial version

--- a/base-specs/pygtk2.spec	Thu Nov 01 12:50:42 2007 +0000
+++ b/base-specs/pygtk2.spec	Fri Nov 02 01:39:08 2007 +0000
@@ -18,6 +18,10 @@
 Source:			http://ftp.gnome.org/pub/GNOME/sources/pygtk/2.12/pygtk-%{version}.tar.bz2
 # date:2005-10-27 owner:dcarbery type:feature bugzilla:385131
 Patch1:                 pygtk2-01-uninstalled.pc.diff
+# The numpy integration patch is based on the pygtk_r2808_patch_for_numpy found
+# at this URL - http://www.scipy.org/Porting_to_NumPy.
+# date:2007-10-22 owner:yippi type:bug state:upstream
+Patch2:                 pygtk2-02-numpy-r2808.diff
 URL:			http://www.gnome.org
 BuildRoot:		%{_tmppath}/%{name}-%{version}-build
 Docdir:			%{_defaultdocdir}/doc
@@ -59,8 +63,10 @@
 %prep
 %setup -q -n pygtk-%{version}
 %patch1 -p1
+%patch2 -p1
 
 %build
+export CFLAGS="$CFLAGS -I/usr/lib/python2.4/vendor-packages/numpy/core/include"
 autoconf
 ./configure 	--prefix=%{_prefix}		\
 	    	--sysconfdir=%{_sysconfdir}
@@ -95,6 +101,9 @@
 %{_datadir}/pygtk/*
 
 %changelog -n pygtk2
+* Mon Oct 22 2007 - [email protected]
+- Add patch so pygtk builds against numpy to add numeric processing extension
+  support.
 * Wed Sep 19 2007 - [email protected]
 - Bump to 2.12.0.
 * Mon Aug 27 2007 - [email protected]

--- a/base-specs/pyxml.spec	Thu Nov 01 12:50:42 2007 +0000
+++ b/base-specs/pyxml.spec	Fri Nov 02 01:39:08 2007 +0000
@@ -19,7 +19,7 @@
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
 Summary:      Python XML module
-Source:       http://umn.dl.sourceforge.net/sourceforge/pyxml/PyXML-0.8.4.tar.gz
+Source:       http://superb-west.dl.sourceforge.net/sourceforge/pyxml/PyXML-0.8.4.tar.gz
 URL:          http://pyxml.sourceforge.net/
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/doc
@@ -57,5 +57,7 @@
 %{_libdir}/python?.?/vendor-packages
 
 %changelog
+* Thu Nov 01 2007 - [email protected]
+- Fix Source URL.
 * Thu Oct 27 2005 - [email protected]
 - initial version

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pygtk2-02-numpy-r2808.diff	Fri Nov 02 01:39:08 2007 +0000
@@ -0,0 +1,56 @@
+Index: gtk/gdk.override
+===================================================================
+--- pygtk-2.12.0/gtk/gdk.override	(revision 2808)
++++ pygtk-2.12.0/gtk/gdk.override	(working copy)
+@@ -43,7 +43,7 @@
+ #define GDK_DISPLAY(object) (GDK_DISPLAY_OBJECT(object))
+ 
+ #ifdef HAVE_NUMPY
+-#  include <Numeric/arrayobject.h>
++#  include <numpy/arrayobject.h>
+ static int have_numpy(void);
+ #endif
+ 
+Index: configure.in
+===================================================================
+--- pygtk-2.12.0/configure.in	(revision 2808)
++++ pygtk-2.12.0/configure.in	(working copy)
+@@ -270,8 +270,9 @@
+ 
+ if test "x$enable_numpy" != xno; then
+   save_CPPFLAGS="$CPPFLAGS"
+-  CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
+-  AC_CHECK_HEADER([Numeric/arrayobject.h],
++  numpy_INCLUDES=`$PYTHON -c "import numpy; print numpy.get_include()"`
++  CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES -I$numpy_INCLUDES"
++  AC_CHECK_HEADER([numpy/arrayobject.h],
+     [AC_DEFINE(HAVE_NUMPY,,[whether to include numeric python support])],,
+     [#include <Python.h>])
+   CPPFLAGS="$save_CPPFLAGS"
+Index: setup.py
+===================================================================
+--- pygtk-2.12.0/setup.py	(revision 2808)
++++ pygtk-2.12.0/setup.py	(working copy)
+@@ -231,16 +231,16 @@
+         data_files.append((DEFS_DIR, ('pangocairo.defs',)))
+         GLOBAL_MACROS.append(('HAVE_PYCAIRO',1))
+ if gtk.can_build():
+-    if '--disable-numeric' in sys.argv:
+-        sys.argv.remove('--disable-numeric')
++    if '--disable-numpy' in sys.argv:
++        sys.argv.remove('--disable-numpy')
+     else:
+         try:
+-            import Numeric
+-            Numeric # pyflakes
++            import numpy
++            numpy # pyflakes
+             GLOBAL_MACROS.append(('HAVE_NUMPY', 1))
+         except ImportError:
+-            print ('* Numeric module could not be found, '
+-                   'will build without Numeric support.')
++            print ('* numpy module could not be found, '
++                   'will build without NumPy support.')
+     ext_modules.append(gtk)
+     data_files.append((os.path.join(INCLUDE_DIR, 'pygtk'), ('gtk/pygtk.h',)))
+     data_files.append((DEFS_DIR, ('gtk/gdk.defs', 'gtk/gdk-types.defs',