rpms/rekall/FC-5 rekall-2.4.5-gcc4.patch, NONE, 1.1 rekall-2.4.5-lib64.patch, NONE, 1.1 rekall-2.4.5-qt3-kdedocdir.patch, NONE, 1.1 rekall.spec, 1.13, 1.14 sources, 1.5, 1.6

Tom Callaway (spot) fedora-extras-commits at redhat.com
Thu Jan 18 16:37:35 UTC 2007 

Author: spot

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

Modified Files:
	rekall.spec sources 
Added Files:
	rekall-2.4.5-gcc4.patch rekall-2.4.5-lib64.patch 
	rekall-2.4.5-qt3-kdedocdir.patch 
Log Message:

Bump rekall to 2.4.5


rekall-2.4.5-gcc4.patch:

--- NEW FILE rekall-2.4.5-gcc4.patch ---
--- rekall-2.4.5/support/dbtcp/dbug.c.BAD	2007-01-17 20:17:15.000000000 -0600
+++ rekall-2.4.5/support/dbtcp/dbug.c	2007-01-17 20:17:23.000000000 -0600
@@ -203,7 +203,7 @@
 IMPORT int fclose ();		/* Close a stream */
 IMPORT FILE *fopen ();		/* Open a stream */
 /*IMPORT int fprintf ();		Formatted print on file */
-IMPORT int vfprintf ();		/* Varargs form of fprintf */
+/*IMPORT int vfprintf ();		Varargs form of fprintf */
 IMPORT VOID free ();
 IMPORT char *malloc ();		/* Allocate memory */
 IMPORT int strlen ();

rekall-2.4.5-lib64.patch:

--- NEW FILE rekall-2.4.5-lib64.patch ---
--- rekall-2.4.5/scons/rkBuilder.py.BAD	2007-01-17 20:15:48.000000000 -0600
+++ rekall-2.4.5/scons/rkBuilder.py	2007-01-17 20:16:04.000000000 -0600
@@ -131,9 +131,9 @@
 if rkConfig.mode in [ 'qt3' ] :
     instDir		= rkConfig.prefix
     binDir		= destDir + os.path.join (instDir, 'bin')
-    libDir		= destDir + os.path.join (instDir, 'lib')
+    libDir		= destDir + os.path.join (instDir, 'lib64')
     pyLibDir		= destDir + os.path.join (rkConfig.pythonLibDir, rkConfig.pythonLib, 'site-packages')
-    pluginDir		= destDir + os.path.join (instDir, 'lib')
+    pluginDir		= destDir + os.path.join (instDir, 'lib64')
     appDir		= destDir + os.path.join (instDir, 'share', 'apps', rkConfig.appName)
     rekallServicesDir	= os.path.join (appDir,  'services')
     rekallGUIDir	= os.path.join (appDir,  'gui')
@@ -141,9 +141,9 @@
 if rkConfig.mode in [ 'kde' ] :
     instDir		= rkConfig.prefix
     binDir		= destDir + os.path.join (instDir, 'bin')
-    libDir		= destDir + os.path.join (instDir, 'lib')
+    libDir		= destDir + os.path.join (instDir, 'lib64')
     pyLibDir		= destDir + os.path.join (rkConfig.pythonLibDir, rkConfig.pythonLib, 'site-packages')
-    pluginDir		= destDir + os.path.join (instDir, 'lib')
+    pluginDir		= destDir + os.path.join (instDir, 'lib64')
     appDir		= destDir + os.path.join (instDir, 'share', 'apps', rkConfig.appName)
     rekallServicesDir	= os.path.join (appDir,  'services')
     rekallGUIDir	= os.path.join (appDir,  'gui')

rekall-2.4.5-qt3-kdedocdir.patch:

--- NEW FILE rekall-2.4.5-qt3-kdedocdir.patch ---
--- rekall-2.4.5/doc/rekall/rkScan_doc.py.BAD	2007-01-17 21:44:24.000000000 -0600
+++ rekall-2.4.5/doc/rekall/rkScan_doc.py	2007-01-17 21:45:01.000000000 -0600
@@ -53,7 +53,8 @@
             text = text + "kdedocdir = None\n"
         else :
             text = text + "kdedocdir = '%s'\n" % kdedocdir
-
+    else :
+        text = text + "kdedocdir = None\n"
 
     return text
 


Index: rekall.spec
===================================================================
RCS file: /cvs/extras/rpms/rekall/FC-5/rekall.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- rekall.spec	18 Sep 2006 13:45:39 -0000	1.13
+++ rekall.spec	18 Jan 2007 16:37:05 -0000	1.14
@@ -1,20 +1,19 @@
 Name:		rekall
 Summary:	A KDE database front-end application
-Version:	2.4.3
-Release:	4%{?dist}
+Version:	2.4.5
+Release:	1%{?dist}
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.rekallrevealed.org/
 Source0: 	http://www.rekallrevealed.org/packages/%{name}-%{version}.tar.gz
-Patch1:		rekall-2.4.0-64bitfix.patch
-Patch2:		rekall-2.4.0-gcc4.patch
-Patch3:		rekall-2.4.0-qtfix.patch
+Patch0:		rekall-2.4.5-gcc4.patch
 Patch4:		rekall-2.4.0-noldconfig.patch
-Patch5:		rekall-2.4.0-lib64.patch
+Patch5:		rekall-2.4.5-lib64.patch
+Patch7:		rekall-2.4.5-qt3-kdedocdir.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, flex, bison
+BuildRequires:  scons, flex, bison, sqlite-devel
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 Provides:	rekall-common = %{version}-%{release}
@@ -76,15 +75,23 @@
 %description python
 Python components and scripts for Rekall.
 
+%package sqlite
+Summary: Rekall SQLite support
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description sqlite
+SQLite components and scripts for Rekall.
+
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
-# %patch3 -p1
+%patch0 -p1
 %patch4 -p1
 %ifarch sparc64 alpha x86_64 ia64
 %patch5 -p1
 %endif
+# missing kdedocdir define on qt3 build
+%patch7 -p1
 rm -rf libs/el32/hash.cpp.orig libs/kbase/kb_parse.cpp.orig libs/kbase/kb_link.cpp.orig
 
 %build
@@ -108,8 +115,6 @@
 make DESTDIR=$RPM_BUILD_ROOT install.qt3
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-mv $RPM_BUILD_ROOT%{_datadir}/doc/HTML $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 install -m0644 kbase/rekall.desktop $RPM_BUILD_ROOT%{_datadir}
 
@@ -124,12 +129,22 @@
 # No need to have this file twice.
 rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/rekallqt/LICENSE
 
+# Nuke .la files
+rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
+
 cd $RPM_BUILD_ROOT%{_datadir}
 ln -s %{_datadir}/apps/rekallqt/icons/hicolor/32x32/apps/rekall.png pixmaps/rekall.png
 cd $RPM_BUILD_ROOT%{_bindir}
 ln -s %{_bindir}/rekallqt rekall
 ln -s %{_bindir}/rekallqtManual rekallManual
 
+# rekall needs these files to exist as .so to function properly.
+cd $RPM_BUILD_ROOT%{_libdir}
+for i in *.so.245; do
+  NEWNAME=`echo $i | sed 's/.245//'`;
+  ln -s $i $NEWNAME;
+done
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -159,10 +174,14 @@
 
 %postun python -p /sbin/ldconfig
 
+%post sqlite -p /sbin/ldconfig
+
+%postun sqlite -p /sbin/ldconfig
+
 %files
 %defattr(-, root, root, 0755)
 %doc LICENSE
-%{_libdir}/librekallqt.so
+%{_libdir}/librekallqt.so*
 %{_bindir}/rekall
 %{_bindir}/rekallqt
 %{_bindir}/rkdcop
@@ -170,13 +189,13 @@
 %dir %{_datadir}/apps/rekallqt
 %{_datadir}/apps/rekallqt/dict/
 %{_datadir}/apps/rekallqt/gui/
-%{_datadir}/apps/rekallqt/help/
 %{_datadir}/apps/rekallqt/highlights/
 %{_datadir}/apps/rekallqt/icons/
 %{_datadir}/apps/rekallqt/keymap*
 %{_datadir}/apps/rekallqt/pics/
 %{_datadir}/apps/rekallqt/rekall.png
 %{_datadir}/apps/rekallqt/rekall_lite.png
+%{_datadir}/apps/rekallqt/services/kdeparts.lst
 %{_datadir}/apps/rekallqt/services/rekall_component.desktop
 %{_datadir}/apps/rekallqt/services/rekall_copier.desktop
 %{_datadir}/apps/rekallqt/services/rekall_driver_dbtcp.desktop
@@ -197,29 +216,29 @@
 %{_datadir}/apps/rekallqt/test/
 %{_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
+%{_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 docs
 %defattr(-, root, root, 0755)
@@ -232,17 +251,17 @@
 %files extra
 %defattr(-, root, root, 0755)
 %{_datadir}/apps/rekallqt/services/rekall_plugin_extra.desktop
-%{_libdir}/librekallqt_plugin_extra.so
+%{_libdir}/librekallqt_plugin_extra.so*
 
 %files mysql
 %defattr(-, root, root, 0755)
 %{_datadir}/apps/rekallqt/services/rekall_driver_mysql.desktop
-%{_libdir}/librekallqt_driver_mysql.so
+%{_libdir}/librekallqt_driver_mysql.so*
 
 %files postgresql
 %defattr(-, root, root, 0755)
 %{_datadir}/apps/rekallqt/services/rekall_driver_pgsql.desktop
-%{_libdir}/librekallqt_driver_pgsql.so
+%{_libdir}/librekallqt_driver_pgsql.so*
 
 %files python
 %defattr(-, root, root, 0755)
@@ -251,10 +270,21 @@
 %dir %{_datadir}/apps/rekallqt/script/py
 %{_datadir}/apps/rekallqt/script/py/*
 %{_datadir}/apps/rekallqt/services/rekall_script_py.desktop
-%{_libdir}/librekallqt_script_py.so
+%{_libdir}/librekallqt_script_py.so*
 %{_libdir}/python*/site-packages/rkdcop.so
 
+%files sqlite
+%defattr(-, root, root, 0755)
+%{_datadir}/apps/rekallqt/services/rekall_driver_sqlite3.desktop
+%{_libdir}/librekallqt_driver_sqlite3.so*
+
 %changelog
+* Wed Jan 17 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.5-1
+- bump to 2.4.5
+
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.4.3-5
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Sun Sep 17 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.3-4
 - fix 64 bit, nuke -common, add new files
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rekall/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Sep 2006 13:45:39 -0000	1.5
+++ sources	18 Jan 2007 16:37:05 -0000	1.6
@@ -1 +1 @@
-d72ab22d40f1556027c473eed9783297  rekall-2.4.3.tar.gz
+957858c14b5ba8f473ae8c97b6ea48bd  rekall-2.4.5.tar.gz

More information about the scm-commits mailing list