rpms/rekall/devel rekall-2.4.6-fixflags.patch, NONE, 1.1 rekall-2.4.6-xbsql.l.patch, NONE, 1.1 rekall.spec, 1.36, 1.37

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/rekall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27602

Modified Files:
	rekall.spec 
Added Files:
	rekall-2.4.6-fixflags.patch rekall-2.4.6-xbsql.l.patch 
Log Message:
slap more glue on this thing

rekall-2.4.6-fixflags.patch:

--- NEW FILE rekall-2.4.6-fixflags.patch ---
diff -up rekall-2.4.6/libs/el32/SConscript.fixflags rekall-2.4.6/libs/el32/SConscript
--- rekall-2.4.6/libs/el32/SConscript.fixflags	2008-12-24 22:53:47.000000000 -0500
+++ rekall-2.4.6/libs/el32/SConscript	2008-12-24 22:54:46.000000000 -0500
@@ -40,8 +40,8 @@ env	= rb.environment ()
 
 if   rkConfig.mode != 'win' :
 
-    env.Append	(LEXFLAGS  = '-Pel_yy --nounistd')
-    env.Append	(YACCFLAGS = '-pel_yy')
+    env.Append	(LEXFLAGS  = ['-Pel_yy', '--nounistd'])
+    env.Append	(YACCFLAGS = ['-pel_yy'])
     env.CFile 	('lex.el_yy.c', 'el.l')
     env.CFile 	('el.tab.cpp',  'el.y')
 
diff -up rekall-2.4.6/support/xbsql/SConscript.fixflags rekall-2.4.6/support/xbsql/SConscript
--- rekall-2.4.6/support/xbsql/SConscript.fixflags	2008-12-24 22:55:25.000000000 -0500
+++ rekall-2.4.6/support/xbsql/SConscript	2008-12-24 22:55:52.000000000 -0500
@@ -45,8 +45,8 @@ if rkConfig.xbaseBuild :
 
     if rkConfig.mode != 'win' :
 
-        env.Append(LEXFLAGS  = '-Pxbsql_yy')
-        env.Append(YACCFLAGS = '-pxbsql_yy')
+        env.Append(LEXFLAGS  = ['-Pxbsql_yy'])
+        env.Append(YACCFLAGS = ['-pxbsql_yy'])
         env.CFile ('lex.xbsql_yy.c', 'xbsql.l')
         env.CFile ('xbsql.tab.cpp',  'xbsql.y')
 

rekall-2.4.6-xbsql.l.patch:

--- NEW FILE rekall-2.4.6-xbsql.l.patch ---
diff -up rekall-2.4.6/support/xbsql/xbsql.l.fix rekall-2.4.6/support/xbsql/xbsql.l
--- rekall-2.4.6/support/xbsql/xbsql.l.fix	2006-07-25 05:33:40.000000000 -0400
+++ rekall-2.4.6/support/xbsql/xbsql.l	2008-12-24 23:41:33.000000000 -0500
@@ -92,7 +92,6 @@ static	KEYWORD	keywds[] =
 	{	0,	"index",	T_INDEX		},
 	{	0,	"unique",	T_UNIQUE	},
 	{	0,	"order",	T_ORDER		},
-	{	0,	"by",		T_BY		},
 	{	0,	"asc",		T_ASCENDING	},
 	{	0,	"desc",		T_DESCENDING	},
 	{	0,	"null",		T_NULL		},
diff -up rekall-2.4.6/support/xbsql/xbsql.y.fix rekall-2.4.6/support/xbsql/xbsql.y
--- rekall-2.4.6/support/xbsql/xbsql.y.fix	2006-07-25 05:33:40.000000000 -0400
+++ rekall-2.4.6/support/xbsql/xbsql.y	2008-12-24 23:42:17.000000000 -0500
@@ -103,7 +103,6 @@ XBSQLCommand	*xbQuery	;
 %token	T_UNIQUE
 %token	T_INDEX
 %token	T_ORDER
-%token	T_BY
 %token	T_ASCENDING
 %token	T_DESCENDING
 %token	T_NULL
@@ -191,11 +190,11 @@ XBSQLCommand	*xbQuery	;
 %type	<query>		query
 %%
 
-query:		select	{ $$ = $1 } |
-		insert	{ $$ = $1 } |
-		update	{ $$ = $1 } |
-		delete	{ $$ = $1 } |
-		create	{ $$ = $1 } |
+query:		select	{ $$ = $1 ; } |
+		insert	{ $$ = $1 ; } |
+		update	{ $$ = $1 ; } |
+		delete	{ $$ = $1 ; } |
+		create	{ $$ = $1 ; } |
 		drop	
 
 select:		T_SELECT selectlist T_FROM tablelist wherepart grouppart havingpart orderpart


Index: rekall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rekall/devel/rekall.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- rekall.spec	29 Nov 2008 17:21:06 -0000	1.36
+++ rekall.spec	25 Dec 2008 05:12:27 -0000	1.37
@@ -1,7 +1,9 @@
+%{!?python_includedir: %define python_includedir %(%{__python} -c "from distutils.sysconfig import get_python_inc; print get_python_inc()")}
+
 Name:		rekall
 Summary:	A KDE database front-end application
 Version:	2.4.6
-Release:	6%{?dist}
+Release:	7%{?dist}
 Group:		Development/Tools
 License:	GPLv2
 URL:		http://www.rekallrevealed.org/
@@ -14,10 +16,13 @@
 Patch7:		rekall-flex-glibc27.diff
 Patch8:		rekall-xbsql-overflows.diff
 Patch9:		rekall-2.4.6-gcc43.patch
+Patch10:	rekall-2.4.6-fixflags.patch
+Patch11:	rekall-2.4.6-xbsql.l.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	python-devel, mysql-devel, postgresql-devel, unixODBC-devel
 BuildRequires:	kdelibs3-devel, desktop-file-utils, libacl-devel
 BuildRequires:  scons, flex, bison, sqlite-devel, pcre-devel
+BuildRequires:  mdbtools-devel, pkgconfig
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -51,6 +56,14 @@
 %description extra
 Rekall Extra Stuff Plugin.
 
+%package mdb
+Summary: Rekall Microsoft Access DB driver
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description mdb
+Driver to add Microsoft Access database support to Rekall.
+
 %package mysql
 Summary: Rekall MySQL driver
 Group: System Environment/Libraries
@@ -107,17 +120,25 @@
 %patch8 -p1
 # Fix gcc43 compile
 %patch9 -p1
+# Fix YACCFLAGS, LEXFLAGS
+%patch10 -p1
+# Fix xbsql.l
+%patch11 -p1 -b .fix
+
 rm -rf libs/el32/hash.cpp.orig libs/kbase/kb_parse.cpp.orig libs/kbase/kb_link.cpp.orig
 
 %build
 export KDEDIR=%{_prefix}
-PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"`
+GLIB2_CFLAGS=`pkg-config --cflags glib-2.0`
+PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS $GLIB2_CFLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"`
 sed -i "s|'-Wall'|[$PARSED_OPT_FLAGS]|" scons/rkBuilder.py
 echo "prefix=%{_prefix}" >> scons/settings.qt3
+echo "with-mdb-libraries=%{_libdir}" >> scons/settings.qt3
 echo "with-mysql-libraries=%{_libdir}/mysql" >> scons/settings.qt3
 echo "with-odbc-libraries=%{_libdir}" >> scons/settings.qt3
 echo "with-pcre-libraries=%{_libdir}" >> scons/settings.qt3
 echo "with-pgsql-libraries=%{_libdir}" >> scons/settings.qt3
+echo "with-python-includes=%{python_includedir}" >> 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
@@ -179,6 +200,10 @@
 
 %postun extra -p /sbin/ldconfig
 
+%post mdb -p /sbin/ldconfig
+
+%postun mdb -p /sbin/ldconfig
+
 %post mysql -p /sbin/ldconfig
 
 %postun mysql -p /sbin/ldconfig
@@ -276,6 +301,11 @@
 %{_datadir}/apps/rekallqt/services/rekall_plugin_extra.desktop
 %{_libdir}/librekallqt_plugin_extra.so*
 
+%files mdb
+%defattr(-, root, root, 0755)
+%{_datadir}/apps/rekallqt/services/rekall_driver_mdb.desktop
+%{_libdir}/librekallqt_driver_mdb.so*
+
 %files mysql
 %defattr(-, root, root, 0755)
 %{_datadir}/apps/rekallqt/services/rekall_driver_mysql.desktop
@@ -307,6 +337,10 @@
 %{_libdir}/librekallqt_driver_sqlite3.so*
 
 %changelog
+* Wed Dec 24 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.6-7
+- manually tell it where to find python includedir based on what we have
+- enable support for mdb (thanks to mdbtools)
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.4.6-6
 - Rebuild for Python 2.6