rpms/rekall/devel rekall-2.2.3-64bitfix.patch, 1.5, 1.6 rekall.spec, 1.5, 1.6

[Tom Callaway (spot)]

Author: spot

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

Modified Files:
	rekall-2.2.3-64bitfix.patch rekall.spec 
Log Message:

Fix 64bit (finally)


rekall-2.2.3-64bitfix.patch:

Index: rekall-2.2.3-64bitfix.patch
===================================================================
RCS file: /cvs/extras/rpms/rekall/devel/rekall-2.2.3-64bitfix.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rekall-2.2.3-64bitfix.patch	23 Sep 2005 03:08:47 -0000	1.5
+++ rekall-2.2.3-64bitfix.patch	6 Oct 2005 16:15:19 -0000	1.6
@@ -116,3 +116,65 @@
  	return	true	;
  }
  
+--- rekall-2.2.4/libs/kbase/kb_overridedlg.cpp.BAD	2005-09-23 11:00:50.000000000 -0500
++++ rekall-2.2.4/libs/kbase/kb_overridedlg.cpp	2005-09-23 11:01:04.000000000 -0500
+@@ -333,7 +333,7 @@
+ 	old.clear () ;
+ 
+ 	QListViewItem	*item	= m_lvOverride.firstChild() ;
+-	uint		ident	= 0x000ffffff & (uint)(void *)item ;
++	uint		ident	= 0x000ffffff & (unsigned long)(void *)item ;
+ 
+ 	while (item != 0)
+ 	{
+--- rekall-2.2.4/libs/kbase/kb_configdlg.cpp.BAD	2005-10-05 13:00:35.000000000 -0500
++++ rekall-2.2.4/libs/kbase/kb_configdlg.cpp	2005-10-05 13:01:02.000000000 -0500
+@@ -337,7 +337,7 @@
+ 	old.clear () ;
+ 
+ 	QListViewItem	*item	= m_lvConfigs.firstChild() ;
+-	uint		ident	= 0x000ffffff & (uint)(void *)item ;
++	uint		ident	= 0x000ffffff & (unsigned long)(void *)item ;
+ 
+ 	while (item != 0)
+ 	{
+--- rekall-2.2.4/script/python/lib-sys/tkc_pydebugbase.cpp.BAD	2005-10-06 08:01:42.000000000 -0500
++++ rekall-2.2.4/script/python/lib-sys/tkc_pydebugbase.cpp	2005-10-06 08:04:37.000000000 -0500
+@@ -550,7 +550,7 @@
+ 	if (PyModule_Check (pyObj) || PyCode_Check (pyObj))
+ 		if (findTracePoint (pyObj, lineNo) == 0)
+ 		{
+-			fprintf	(stderr, "Set trace: %08x:%d\n", (uint)pyObj, lineNo) ;
++			fprintf	(stderr, "Set trace: %08x:%d\n", (unsigned long)pyObj, lineNo) ;
+ 			tracePoints.append (new TKCPyTracePoint (pyObj, userPtr, lineNo)) ;
+ 			enable	() ;
+ 		}
+@@ -573,7 +573,7 @@
+ 	if (PyModule_Check (pyObj) || PyCode_Check (pyObj))
+ 		if ((tp = findTracePoint (pyObj, lineNo)) != 0)
+ 		{
+-			fprintf	(stderr, "Rem trace: %08x:%d\n", (uint)pyObj, lineNo) ;
++			fprintf	(stderr, "Rem trace: %08x:%d\n", (unsigned long)pyObj, lineNo) ;
+ 			tracePoints.remove (tp) ;
+ 			delete	tp ;
+ 			disable	() ;
+--- rekall-2.2.4/script/python/lib-sys_rt/tkc_pydebugbase.cpp.BAD	2005-10-06 09:00:06.000000000 -0500
++++ rekall-2.2.4/script/python/lib-sys_rt/tkc_pydebugbase.cpp	2005-10-06 09:00:27.000000000 -0500
+@@ -550,7 +550,7 @@
+ 	if (PyModule_Check (pyObj) || PyCode_Check (pyObj))
+ 		if (findTracePoint (pyObj, lineNo) == 0)
+ 		{
+-			fprintf	(stderr, "Set trace: %08x:%d\n", (uint)pyObj, lineNo) ;
++			fprintf	(stderr, "Set trace: %08x:%d\n", (unsigned long)pyObj, lineNo) ;
+ 			tracePoints.append (new TKCPyTracePoint (pyObj, userPtr, lineNo)) ;
+ 			enable	() ;
+ 		}
+@@ -573,7 +573,7 @@
+ 	if (PyModule_Check (pyObj) || PyCode_Check (pyObj))
+ 		if ((tp = findTracePoint (pyObj, lineNo)) != 0)
+ 		{
+-			fprintf	(stderr, "Rem trace: %08x:%d\n", (uint)pyObj, lineNo) ;
++			fprintf	(stderr, "Rem trace: %08x:%d\n", (unsigned long)pyObj, lineNo) ;
+ 			tracePoints.remove (tp) ;
+ 			delete	tp ;
+ 			disable	() ;


Index: rekall.spec
===================================================================
RCS file: /cvs/extras/rpms/rekall/devel/rekall.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rekall.spec	23 Sep 2005 03:08:47 -0000	1.5
+++ rekall.spec	6 Oct 2005 16:15:19 -0000	1.6
@@ -1,7 +1,7 @@
 Name:		rekall
 Summary:	A KDE database front-end application
 Version:	2.2.4
-Release:	4%{?dist}
+Release:	7%{?dist}
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.rekallrevealed.org/
@@ -11,7 +11,7 @@
 Patch2:		rekall-2.2.3-64bitfix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	xbsql-devel, python-devel, mysql-devel, postgresql-devel
-BuildRequires:	kdelibs-devel, desktop-file-utils
+BuildRequires:	kdelibs-devel, desktop-file-utils, libacl-devel
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 Requires:	rekall-common = %{version}-%{release}
@@ -336,6 +336,12 @@
 %{_libdir}/librekallrt.la
 
 %changelog
+* Wed Oct  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.4-7
+- BR: libacl-devel
+
+* Fri Sep 23 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.4-5
+- 64 bit fixes (the shock!)
+
 * Thu Sep 22 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.4-4
 - yes. another one.