[rekall] Fix building with mdbtools-0.7

[Hans de Goede]

commit fa62d388dfeebb98b86d2237f59a6407a4c36024
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Wed May 21 15:03:11 2014 +0200

    Fix building with mdbtools-0.7

 rekall-2.4.6-mdbtools-0.7.patch |   21 +++++++++++++++++++++
 rekall.spec                     |   14 ++++++++------
 2 files changed, 29 insertions(+), 6 deletions(-)
---
diff --git a/rekall-2.4.6-mdbtools-0.7.patch b/rekall-2.4.6-mdbtools-0.7.patch
new file mode 100644
index 0000000..8a1d053
--- /dev/null
+++ b/rekall-2.4.6-mdbtools-0.7.patch
@@ -0,0 +1,21 @@
+diff -up rekall-2.4.6/db/mdb/kb_mdb.cpp~ rekall-2.4.6/db/mdb/kb_mdb.cpp
+--- rekall-2.4.6/db/mdb/kb_mdb.cpp~	2007-01-05 15:16:42.000000000 +0100
++++ rekall-2.4.6/db/mdb/kb_mdb.cpp	2014-05-21 14:27:19.984668558 +0200
+@@ -67,7 +67,7 @@ static	MDBTypeMap	typeMap[] =
+ {	MDB_MONEY,		KB::ITFloat,	"Money",	0,			},
+ {	MDB_FLOAT,		KB::ITFloat,	"Float",	0,			},
+ {	MDB_DOUBLE,		KB::ITFloat,	"Double",	0,			},
+-{	MDB_SDATETIME,		KB::ITDateTime,	"DateTime",	0,			},
++{	MDB_DATETIME,		KB::ITDateTime,	"DateTime",	0,			},
+ {	MDB_TEXT,		KB::ITString,	"Text",		0,			},
+ {	MDB_OLE,		KB::ITString,	"OLE",		0,			},
+ {	MDB_MEMO,		KB::ITBinary,	"Memo",		0,			},
+@@ -1023,7 +1023,7 @@ bool	KBMDBQrySelect::execute
+ 					break	  ;
+ 
+ 				case MDB_TEXT	  :
+-				case MDB_SDATETIME:
++				case MDB_DATETIME :
+ 				case MDB_MEMO	  :
+ 				case MDB_OLE	  :
+ 					args[idx] = new STRING(bound_values[idx]) ;
diff --git a/rekall.spec b/rekall.spec
index f35d83f..1740bb3 100644
--- a/rekall.spec
+++ b/rekall.spec
@@ -3,7 +3,7 @@
 Name:		rekall
 Summary:	A KDE database front-end application
 Version:	2.4.6
-Release:	25%{?dist}
+Release:	26%{?dist}
 Group:		Development/Tools
 License:	GPLv2
 URL:		http://www.rekallrevealed.org/
@@ -23,7 +23,7 @@ Patch13:	rekall-2.4.6-fix-desktop-icon.patch
 Patch14:	rekall-gcc45.patch
 Patch15:	rekall-2.4.6-unistd.patch
 Patch16:	rekall-2.4.6-format-security.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch17:	rekall-2.4.6-mdbtools-0.7.patch
 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
@@ -138,6 +138,8 @@ SQLite components and scripts for Rekall.
 %patch15 -p1 -b .gcc47
 # Fix format-security issues
 %patch16 -p1 -b .format-security
+# Fix building with mdbtool-0.7
+%patch17 -p1
 
 rm -rf libs/el32/hash.cpp.orig libs/kbase/kb_parse.cpp.orig libs/kbase/kb_link.cpp.orig
 
@@ -164,7 +166,6 @@ make config.qt3
 make qt3
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install.qt3
 mkdir -p $RPM_BUILD_ROOT%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}/}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
@@ -197,8 +198,6 @@ for i in *.so.246; do
   ln -s $i $SHORTNAME
 done
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
@@ -351,6 +350,9 @@ fi
 %{_libdir}/librekallqt_driver_sqlite3.so*
 
 %changelog
+* Wed May 21 2014 Hans de Goede <hdegoede at redhat.com> - 2.4.6-26
+- Fix building with mdbtools-0.7
+
 * Sun May 18 2014 Peter Robinson <pbrobinson at fedoraproject.org> 2.4.6-25
 - Rebuild (mdbtools)
 
@@ -487,7 +489,7 @@ fi
 * Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.0-1
 - bump to 2.4.0
 
-* Thu Oct  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.4-8
+* Thu Oct  6 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.4-8
 - FC-3 is held together with duct-tape
 
 * Wed Oct  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.4-7