rpms/scipy/devel stsci_image_syntax.patch, NONE, 1.1 scipy.spec, 1.18, 1.19

[Jef Spaleta]

Author: jspaleta

Update of /cvs/pkgs/rpms/scipy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10101

Modified Files:
	scipy.spec 
Added Files:
	stsci_image_syntax.patch 
Log Message:
* Sun Mar 1  2009 Jef Spaleta <jspaleta at fedoraproject.org> - 0.7.0-2
- Patch for stsci image function syntax fix.


stsci_image_syntax.patch:

--- NEW FILE stsci_image_syntax.patch ---
--- scipy/stsci/image/lib/_image.py	2008-11-24 10:52:40.000000000 +0100
+++ scipy/stsci/image/lib/_image.py	2009-02-26 16:43:44.000000000 +0100
@@ -1,5 +1,5 @@
 import numpy as np
-import scipy.stsci.convolve
+import scipy.stsci.convolve as convolve
 import scipy.stsci.convolve._correlate as _correlate
 
 def _translate(a, dx, dy, output=None, mode="nearest", cval=0.0):
@@ -55,4 +55,4 @@
     if output is not None:
         output._copyFrom(np.rot90(output, -rotation%4))
     else:
-        return np.rot90(d, -rotation % 4).astype(a.type())
+        return np.rot90(d, -rotation % 4).astype(a.dtype)



Index: scipy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scipy/devel/scipy.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- scipy.spec	26 Feb 2009 23:56:30 -0000	1.18
+++ scipy.spec	2 Mar 2009 02:10:30 -0000	1.19
@@ -2,7 +2,7 @@
 Summary: Scipy: Scientific Tools for Python
 Name: scipy
 Version: 0.7.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Group: Development/Libraries
 License: BSD and LGPLv2+
@@ -12,6 +12,7 @@
 # These should be removed as soon as upstream pushes a release with this fixed
 Source1: stsci_image_setup.py
 Source2: stsci_convolve_setup.py
+Patch0: stsci_image_syntax.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -36,6 +37,7 @@
 
 %prep 
 %setup -q -n %{name}-%{version}
+%patch0 -p0
 cat > site.cfg << EOF
 [amd]
 library_dirs = %{_libdir}
@@ -73,6 +75,9 @@
 
 
 %changelog
+* Sun Mar 1  2009 Jef Spaleta <jspaleta at fedoraproject.org> - 0.7.0-2
+- Patch for stsci image function syntax fix.
+
 * Thu Feb 26 2009 Jef Spaleta <jspaleta at fedoraproject.org> - 0.7.0-1
 - Update to final 0.7 release