Hello community, here is the log from the commit of package rekall checked in at Thu Oct 16 01:54:05 CEST 2008. -------- --- KDE/rekall/rekall.changes 2008-04-10 19:27:12.000000000 +0200 +++ /d/STABLE/rekall/rekall.changes 2008-10-15 13:11:08.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Oct 15 13:11:01 CEST 2008 - dmueller@suse.de + +- fix build against python 2.6 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- python-2.6.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rekall.spec ++++++ --- /var/tmp/diff_new_pack.p26625/_old 2008-10-16 01:53:27.000000000 +0200 +++ /var/tmp/diff_new_pack.p26625/_new 2008-10-16 01:53:27.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package rekall (Version 2.4.6) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -19,7 +26,7 @@ Group: Productivity/Databases/Clients Summary: Universal Database Application Version: 2.4.6 -Release: 46 +Release: 105 %define rversion %version Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) Requires: %name-database-backend = %version @@ -41,6 +48,7 @@ Patch9: rekall-flex-glibc27.diff Patch10: rekall-xbsql-overflows.diff Patch11: fix-typos.diff +Patch12: python-2.6.diff %description Rekall is a programmable personal database management system (DBMS). It @@ -148,6 +156,7 @@ %patch9 %patch10 %patch11 +%patch12 %build . /etc/opt/kde3/common_options @@ -276,6 +285,8 @@ /opt/kde3/share/apps/rekall/examples %changelog +* Wed Oct 15 2008 dmueller@suse.de +- fix build against python 2.6 * Thu Apr 10 2008 stbinner@suse.de - fix typos in .desktop files (bnc#378389) * Mon Jan 14 2008 dmueller@suse.de ++++++ python-2.6.diff ++++++ --- libs/el32/SConscript +++ libs/el32/SConscript @@ -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') --- support/xbsql/SConscript +++ support/xbsql/SConscript @@ -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') --- scons/rkScan_Python.py +++ scons/rkScan_Python.py @@ -33,13 +33,15 @@ def Scan (settings) : ( 'with-python-includes', [ - '/usr/local/include/python2.5[B', + '/usr/local/include/python2.6', + '/usr/local/include/python2.5', '/usr/local/include/python2.4', '/usr/local/include/python2.3', '/usr/local/include/python2.2', '/usr/local/include/python2.1', '/usr/local/include/python2.0', '/usr/local/include/python1.5', + '/usr/include/python2.6', '/usr/include/python2.5', '/usr/include/python2.4', '/usr/include/python2.3', @@ -56,6 +58,7 @@ def Scan (settings) : [ '/usr/local/lib', '/usr/lib', + '/usr/local/lib/python2.6/config', '/usr/local/lib/python2.5/config', '/usr/local/lib/python2.4/config', '/usr/local/lib/python2.3/config', @@ -63,6 +66,7 @@ def Scan (settings) : '/usr/local/lib/python2.1/config', '/usr/local/lib/python2.0/config', '/usr/local/lib/python1.5/config', + '/usr/lib/python2.6/config', '/usr/lib/python2.5/config', '/usr/lib/python2.4/config', '/usr/lib/python2.3/config', ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org