rpms/rekall/FC-4 rekall-2.4.0-lib64.patch, NONE, 1.1 rekall-2.4.0-64bitfix.patch, 1.1, 1.2 rekall.spec, 1.10, 1.11

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/rekall/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27064/FC-4

Modified Files:
	rekall-2.4.0-64bitfix.patch rekall.spec 
Added Files:
	rekall-2.4.0-lib64.patch 
Log Message:

real x86_64 fix


rekall-2.4.0-lib64.patch:

--- NEW FILE rekall-2.4.0-lib64.patch ---
--- rekall-2.4.0/scons/rkBuilder.py.BAD	2006-03-02 11:48:44.000000000 -0600
+++ rekall-2.4.0/scons/rkBuilder.py	2006-03-02 11:49:02.000000000 -0600
@@ -49,8 +49,8 @@
 if rkConfig.mode in [ 'qt3' ] :
     instDir		= rkConfig.prefix
     binDir		= destDir + os.path.join (instDir, 'bin')
-    libDir		= destDir + os.path.join (instDir, 'lib')
-    pluginDir		= destDir + os.path.join (instDir, 'lib')
+    libDir		= destDir + os.path.join (instDir, 'lib64')
+    pluginDir		= destDir + os.path.join (instDir, 'lib64')
     appDir		= destDir + os.path.join (instDir, 'share', 'apps', rkConfig.appName)
     docDir		= destDir + os.path.join (instDir, 'share', 'doc', 'HTML', 'en')
     rekallServicesDir	= os.path.join (appDir,  'services')

rekall-2.4.0-64bitfix.patch:

Index: rekall-2.4.0-64bitfix.patch
===================================================================
RCS file: /cvs/extras/rpms/rekall/FC-4/rekall-2.4.0-64bitfix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rekall-2.4.0-64bitfix.patch	12 Jan 2006 06:17:07 -0000	1.1
+++ rekall-2.4.0-64bitfix.patch	2 Mar 2006 18:34:33 -0000	1.2
@@ -107,3 +107,57 @@
  			tracePoints.remove (tp) ;
  			delete	tp ;
  			disable	() ;
+--- rekall-2.4.0/libs/kbase/kb_object_full.cpp.BAD	2006-03-02 10:22:13.000000000 -0600
++++ rekall-2.4.0/libs/kbase/kb_object_full.cpp	2006-03-02 10:22:26.000000000 -0600
+@@ -194,11 +194,11 @@
+ 		}
+ 
+ 		/* Not a special case, call the ::newNode with the	*/
+-		/* specification. The (int) cast is is there because	*/
++		/* specification. The (long) cast is is there because	*/
+ 		/* ::newNode is a slot which the popup menu system	*/
+ 		/* invokes, whence the arguement is really a NodeSpec	*/
+ 		/* structure.						*/
+-		newNode ((int)spec) ;
++		newNode ((long)spec) ;
+ 		return	true ;
+ 	}
+ 
+--- rekall-2.4.0/libs/kbase/kb_tree.cpp.BAD	2006-03-02 10:46:41.000000000 -0600
++++ rekall-2.4.0/libs/kbase/kb_tree.cpp	2006-03-02 10:46:54.000000000 -0600
+@@ -365,21 +365,21 @@
+ 		receiver,
+ 		SLOT(newNode(int)),
+ 		0,
+-		(int)&nodeSpecTable
++		(long)&nodeSpecTable
+ 	)	;
+ 	tp->insertItem
+ 	(	TR("Query tree"),
+ 		receiver,
+ 		SLOT(newNode(int)),
+ 		0,
+-		(int)&nodeSpecQuery
++		(long)&nodeSpecQuery
+ 	)	;
+ 	tp->insertItem
+ 	(	TR("SQL tree"  ),
+ 		receiver,
+ 		SLOT(newNode(int)),
+ 		0,
+-		(int)&nodeSpecSQL
++		(long)&nodeSpecSQL
+ 	) 	;
+ 
+ 	*dflt	= &nodeSpecTable ;
+--- rekall-2.4.0/libs/kbase/kb_stack.cpp.BAD	2006-03-02 11:10:53.000000000 -0600
++++ rekall-2.4.0/libs/kbase/kb_stack.cpp	2006-03-02 11:10:57.000000000 -0600
+@@ -431,7 +431,7 @@
+ 			this,
+ 			SLOT	(setCurrentPage(int)),
+ 			0,
+-			(int)p
++			(long)p
+ 		)	;
+ 
+ 	)


Index: rekall.spec
===================================================================
RCS file: /cvs/extras/rpms/rekall/FC-4/rekall.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rekall.spec	1 Mar 2006 23:15:13 -0000	1.10
+++ rekall.spec	2 Mar 2006 18:34:33 -0000	1.11
@@ -1,7 +1,7 @@
 Name:		rekall
 Summary:	A KDE database front-end application
 Version:	2.4.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.rekallrevealed.org/
@@ -10,10 +10,11 @@
 Patch2:		rekall-2.4.0-gcc4.patch
 Patch3:		rekall-2.4.0-qtfix.patch
 Patch4:		rekall-2.4.0-noldconfig.patch
+Patch5:		rekall-2.4.0-lib64.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	python-devel, mysql-devel, postgresql-devel
 BuildRequires:	kdelibs-devel, desktop-file-utils, libacl-devel
-BuildRequires:  scons
+BuildRequires:  scons, flex, bison
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 Requires:	rekall-common = %{version}-%{release}
@@ -101,6 +102,9 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%ifarch sparc64 alpha x86_64 ia64
+%patch5 -p1
+%endif
 rm -rf libs/el32/hash.cpp.orig libs/kbase/kb_parse.cpp.orig libs/kbase/kb_link.cpp.orig
 
 %build
@@ -108,8 +112,11 @@
 PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"`
 sed -i "s|'-Wall'|[$PARSED_OPT_FLAGS]|" scons/rkBuilder.py
 echo "prefix=%{_prefix}" >> scons/settings.qt3
+echo "with-mysql-libraries=%{_libdir}/mysql" >> scons/settings.qt3
 echo "with-pgsql-libraries=%{_libdir}" >> scons/settings.qt3
 echo "with-python-libraries=%{_libdir}" >> scons/settings.qt3
+echo "with-qt-includes=%{_libdir}/qt-3.3/include" >> scons/settings.qt3
+echo "with-qt-libraries=%{_libdir}/qt-3.3/lib" >> scons/settings.qt3
 cp scons/settings.qt3 settings
 cp scons/Makefile .
 
@@ -311,6 +318,9 @@
 %{_libdir}/librekallqtrt_tableview.so
 
 %changelog
+* Thu Mar  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.0-4
+- really fix 64bit arches
+
 * Wed Mar  1 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.0-3
 - fix x86_64