[python-numdisplay] Fix to make numdisplay work with numpy >= 1.6 (bz #756358)

Sergio Pascual sergiopr at fedoraproject.org
Thu Nov 24 14:37:37 UTC 2011


commit 84aeebf00cb4152f8614ad219797f5d3fefc47cf
Author: Pasrario <harenawer at zoho.com>
Date:   Thu Nov 24 15:37:29 2011 +0100

    Fix to make numdisplay work with numpy >= 1.6 (bz #756358)

 numdisplay-numpy-fix.patch |   12 ++++++++++++
 python-numdisplay.spec     |    7 ++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/numdisplay-numpy-fix.patch b/numdisplay-numpy-fix.patch
new file mode 100644
index 0000000..6d765ac
--- /dev/null
+++ b/numdisplay-numpy-fix.patch
@@ -0,0 +1,12 @@
+diff -ur numdisplay/lib/displaydev.py numdisplay.a/lib/displaydev.py
+--- numdisplay/lib/displaydev.py	2009-11-27 17:11:29.000000000 +0100
++++ numdisplay.a/lib/displaydev.py	2011-11-24 15:27:56.676930843 +0100
+@@ -536,7 +536,7 @@
+         
+         a = n.array([tid,thingct,subunit,0,x,y,z,t],dtype=n.uint16)
+         # Compute the checksum
+-        sum = n.add.reduce(a)
++        sum = n.add.reduce(a, dtype=n.uint16)
+         sum = 0xffff - (sum & 0xffff)
+         a[3] = sum
+         self._write(a.tostring())
diff --git a/python-numdisplay.spec b/python-numdisplay.spec
index 03e6bce..9957710 100644
--- a/python-numdisplay.spec
+++ b/python-numdisplay.spec
@@ -5,7 +5,7 @@
 
 Name: python-numdisplay
 Version: 1.5.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Visualize numpy array objects in ds9
 
 Group: Development/Languages
@@ -13,6 +13,7 @@ License: BSD
 
 URL: http://stsdas.stsci.edu/numdisplay
 Source0: http://stsdas.stsci.edu/download/stsci_python_2.7/numdisplay-%{version}.tar.gz
+Patch0: numdisplay-numpy-fix.patch
 BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Provides: numdisplay
 Requires: numpy
@@ -28,6 +29,7 @@ on any platform which supports Python and numpy.
 
 %prep
 %setup -q -n %{upname}
+%patch0 -p1
 
 %build
 %{__python} setup.py build
@@ -47,6 +49,9 @@ on any platform which supports Python and numpy.
 %exclude %{python_sitelib}/%{upname}/LICENSE.txt
 
 %changelog
+* Thu Nov 24 2011 Sergio Pascual <sergiopr at fedoraproject.org> - 1.5.6-4
+- Fix to make numdisplay work with numpy >= 1.6 (bz #756358)
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list