rpms/rekall/devel rekall-2.4.5-python25.patch, 1.3, 1.4 rekall.spec, 1.24, 1.25

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/rekall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5883

Modified Files:
	rekall-2.4.5-python25.patch rekall.spec 
Log Message:

More python2.5 love


rekall-2.4.5-python25.patch:

Index: rekall-2.4.5-python25.patch
===================================================================
RCS file: /cvs/extras/rpms/rekall/devel/rekall-2.4.5-python25.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rekall-2.4.5-python25.patch	18 Jan 2007 23:53:45 -0000	1.3
+++ rekall-2.4.5-python25.patch	19 Jan 2007 00:42:11 -0000	1.4
@@ -31,3 +31,34 @@
  
  	QByteArray ba	;
  	ba.duplicate	(buffer, len) ;
+--- rekall-2.4.5/script/python/tkc_pydebugbase.cpp.BAD	2007-01-18 18:37:03.000000000 -0600
++++ rekall-2.4.5/script/python/tkc_pydebugbase.cpp	2007-01-18 18:37:25.000000000 -0600
+@@ -1084,7 +1084,7 @@
+ 		PyObject *pvalue ;
+ 		int	 dictPos = 0 ;
+ 
+-		while (PyDict_Next (pyDict, &dictPos, &pkey, &pvalue))
++		while (PyDict_Next (pyDict, (Py_ssize_t *)&dictPos, &pkey, &pvalue))
+ 		{
+ 			DPRINTF
+ 			((	"TKCPyDebugBase::loadDictionary: insert [%s]\n",
+@@ -1147,7 +1147,7 @@
+ 
+ 	/* Scan the dictionary, looking for the object. In certain	*/
+ 	/* cases, we will recurse down ...				*/
+-	while (PyDict_Next (pyDict, &dictPos, &pyKey, &pyValue))
++	while (PyDict_Next (pyDict, (Py_ssize_t *)&dictPos, &pyKey, &pyValue))
+ 	{
+ 		if (pyValue == pyObject)
+ 			return	TKCPyDebugBase::getPythonString (pyKey) ;
+--- rekall-2.4.5/script/python/kb_pysupport.cpp.BAD	2007-01-18 18:34:22.000000000 -0600
++++ rekall-2.4.5/script/python/kb_pysupport.cpp	2007-01-18 18:34:56.000000000 -0600
+@@ -42,7 +42,7 @@
+ 	kbDict.setAutoDelete (true) ;
+ 
+ 	if (pyDict != 0)
+-		while (PyDict_Next (pyDict, &pos, &key, &value))
++		while (PyDict_Next (pyDict, (Py_ssize_t *)&pos, &key, &value))
+ 		{
+ 			bool	error	;
+ 			QString qKey	= kb_pyStringToQString (key,   error) ;


Index: rekall.spec
===================================================================
RCS file: /cvs/extras/rpms/rekall/devel/rekall.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- rekall.spec	18 Jan 2007 23:53:45 -0000	1.24
+++ rekall.spec	19 Jan 2007 00:42:11 -0000	1.25
@@ -1,7 +1,7 @@
 Name:		rekall
 Summary:	A KDE database front-end application
 Version:	2.4.5
-Release:	5%{?dist}.2
+Release:	5%{?dist}.3
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.rekallrevealed.org/
@@ -286,6 +286,9 @@
 %{_libdir}/librekallqt_driver_sqlite3.so*
 
 %changelog
+* Thu Jan 18 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.5-5.3
+- still more python2.5 love
+
 * Thu Jan 18 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.5-5.2
 - more python2.5 love