rpms/rekall/devel rekall-2.4.0-64bitfix.patch, 1.3, 1.4 rekall-2.4.0-lib64.patch, 1.3, 1.4 rekall.spec, 1.15, 1.16

[Tom Callaway (spot)]

Author: spot

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

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

OK. Rekall is working again.


rekall-2.4.0-64bitfix.patch:

Index: rekall-2.4.0-64bitfix.patch
===================================================================
RCS file: /cvs/extras/rpms/rekall/devel/rekall-2.4.0-64bitfix.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rekall-2.4.0-64bitfix.patch	15 Sep 2006 20:05:08 -0000	1.3
+++ rekall-2.4.0-64bitfix.patch	18 Sep 2006 13:45:39 -0000	1.4
@@ -148,3 +148,25 @@
  				lineNo
  			))	;
  			tracePoints.remove (tp) ;
+--- rekall-2.4.3/libs/kbase/kb_configdlg.cpp.BAD	2006-09-17 13:39:09.000000000 -0500
++++ rekall-2.4.3/libs/kbase/kb_configdlg.cpp	2006-09-17 13:39:16.000000000 -0500
+@@ -312,7 +312,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.4.3/libs/kbase/kb_overridedlg.cpp.BAD	2006-09-17 20:17:13.000000000 -0500
++++ rekall-2.4.3/libs/kbase/kb_overridedlg.cpp	2006-09-17 20:17:33.000000000 -0500
+@@ -360,7 +360,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.4.0-lib64.patch:

Index: rekall-2.4.0-lib64.patch
===================================================================
RCS file: /cvs/extras/rpms/rekall/devel/rekall-2.4.0-lib64.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rekall-2.4.0-lib64.patch	18 Sep 2006 01:18:04 -0000	1.3
+++ rekall-2.4.0-lib64.patch	18 Sep 2006 13:45:39 -0000	1.4
@@ -24,14 +24,3 @@
      appDir		= destDir + os.path.join (instDir, 'share', 'apps', rkConfig.appName)
      if rkConfig.deb :
          docDir		= destDir + os.path.join (instDir, 'share', 'doc', 'kde', 'HTML', 'en')
---- rekall-2.4.3/libs/kbase/kb_overridedlg.cpp.BAD	2006-09-17 20:17:13.000000000 -0500
-+++ rekall-2.4.3/libs/kbase/kb_overridedlg.cpp	2006-09-17 20:17:33.000000000 -0500
-@@ -360,7 +360,7 @@
- 	old.clear () ;
- 
- 	QListViewItem	*item	= m_lvOverride->firstChild() ;
--	uint		ident	= 0x000ffffff & (uint)(void *)item ;
-+	uint		ident	= 0x000ffffff & (unsigned long)(void *)item ;
- 
- 	while (item != 0)
- 	{


Index: rekall.spec
===================================================================
RCS file: /cvs/extras/rpms/rekall/devel/rekall.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rekall.spec	15 Sep 2006 20:32:11 -0000	1.15
+++ rekall.spec	18 Sep 2006 13:45:39 -0000	1.16
@@ -1,7 +1,7 @@
 Name:		rekall
 Summary:	A KDE database front-end application
 Version:	2.4.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.rekallrevealed.org/
@@ -17,10 +17,16 @@
 BuildRequires:  scons, flex, bison
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
-Requires:	rekall-common = %{version}-%{release}
+Provides:	rekall-common = %{version}-%{release}
+Obsoletes:	rekall-common
 Provides:	rekall-devel = %{version}-%{release}
 Obsoletes:	rekall-devel
 
+# rekall-runtime went away. Never really seemed useful to me anyways.
+# This provides is bogus, but present to ensure clean upgrades.
+Provides:	rekall-runtime = %{version}-%{release}
+Obsoletes:	rekall-runtime
+
 %description
 Rekall is a database front-end, however, Rekall is not itself a 
 database, and does not include a database. By this we mean that data 
@@ -30,14 +36,6 @@
 database agnostic, and does not have any preferred database (plugins are 
 available for MySQL and PostgreSQL).
 
-%package common
-Summary: Rekall common libraries
-Group: System Environment/Libraries
-
-%description common
-This package contains a set of common libraries that both rekall and 
-rekall-runtime require to function.
-
 %package docs
 Summary: Rekall documentation
 Group: Documentation
@@ -145,10 +143,6 @@
   update-desktop-database %{_datadir}/applications &> /dev/null
 fi
 
-%post common -p /sbin/ldconfig
-
-%postun common -p /sbin/ldconfig
-
 %post extra -p /sbin/ldconfig
 
 %postun extra -p /sbin/ldconfig
@@ -171,6 +165,7 @@
 %{_libdir}/librekallqt.so
 %{_bindir}/rekall
 %{_bindir}/rekallqt
+%{_bindir}/rkdcop
 %{_datadir}/pixmaps/rekall.png
 %dir %{_datadir}/apps/rekallqt
 %{_datadir}/apps/rekallqt/dict/
@@ -184,11 +179,14 @@
 %{_datadir}/apps/rekallqt/rekall_lite.png
 %{_datadir}/apps/rekallqt/services/rekall_component.desktop
 %{_datadir}/apps/rekallqt/services/rekall_copier.desktop
+%{_datadir}/apps/rekallqt/services/rekall_driver_dbtcp.desktop
+%{_datadir}/apps/rekallqt/services/rekall_driver_test.desktop
 %{_datadir}/apps/rekallqt/services/rekall_driver_xbase.desktop
 %{_datadir}/apps/rekallqt/services/rekall_dummy.desktop
 %{_datadir}/apps/rekallqt/services/rekall_editor.desktop
 %{_datadir}/apps/rekallqt/services/rekall_form.desktop
 %{_datadir}/apps/rekallqt/services/rekall_macro.desktop
+%{_datadir}/apps/rekallqt/services/rekall_plugin_scriptall.desktop
 %{_datadir}/apps/rekallqt/services/rekall_query.desktop
 %{_datadir}/apps/rekallqt/services/rekall_report.desktop
 %{_datadir}/apps/rekallqt/services/rekall_script_kjs.desktop
@@ -200,27 +198,29 @@
 %{_datadir}/apps/rekallqt/wizards/
 %{_datadir}/applications/fedora-rekall.desktop
 %{_libdir}/librekallqt_app.so
+%{_libdir}/librekallqt_common.so
 %{_libdir}/librekallqt_componentview.so
 %{_libdir}/librekallqt_copierview.so
+%{_libdir}/librekallqt_driver_dbtcp.so
+%{_libdir}/librekallqt_driver_test.so
 %{_libdir}/librekallqt_driver_xbase.so
 %{_libdir}/librekallqt_editor.so
 %{_libdir}/librekallqt_el32.so
 %{_libdir}/librekallqt_formview.so
+%{_libdir}/librekallqt_kde.so
+%{_libdir}/librekallqt_kjs.so
 %{_libdir}/librekallqt_macroview.so
 %{_libdir}/librekallqt_queryview.so
 %{_libdir}/librekallqt_reportview.so
+%{_libdir}/librekallqt_rkdcop.so
+%{_libdir}/librekallqt_script_kjs.so
+%{_libdir}/librekallqt_scriptall.so
 %{_libdir}/librekallqt_tableview.so
+%{_libdir}/librekallqt_support_dbtcp.so
 %{_libdir}/librekallqt_support_xbase.so
 %{_libdir}/librekallqt_support_xbsql.so
 %{_libdir}/librekallqt_wizard.so
 
-%files common
-%defattr(-, root, root, 0755)
-%{_libdir}/librekallqt_common.so
-%{_libdir}/librekallqt_kde.so
-%{_libdir}/librekallqt_kjs.so
-%{_libdir}/librekallqt_script_kjs.so
-
 %files docs
 %defattr(-, root, root, 0755)
 %doc AUTHORS README.FIRST Release.Notes
@@ -252,8 +252,12 @@
 %{_datadir}/apps/rekallqt/script/py/*
 %{_datadir}/apps/rekallqt/services/rekall_script_py.desktop
 %{_libdir}/librekallqt_script_py.so
+%{_libdir}/python*/site-packages/rkdcop.so
 
 %changelog
+* Sun Sep 17 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.3-4
+- fix 64 bit, nuke -common, add new files
+
 * Fri Sep 15 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.3-3
 - actually upload new source
 - no more rt bits