Hello community,
here is the log from the commit of package rekall
checked in at Sun Feb 25 23:37:07 CET 2007.
--------
--- KDE/rekall/rekall.changes 2007-02-01 15:38:11.000000000 +0100
+++ /mounts/work_src_done/STABLE/rekall/rekall.changes 2007-02-24 23:37:17.215626000 +0100
@@ -1,0 +2,8 @@
+Sat Feb 24 23:21:49 CET 2007 - dmueller@suse.de
+
+- update to 2.4.5:
+ * Dynamic Layouts, Tool Boxes, Wizards
+ * Test Suite support
+ * Manual viewer
+
+-------------------------------------------------------------------
Old:
----
autotools.diff
i18n.diff
rekall-2.2.6-gcc4.diff
rekall-2.2.6.tar.bz2
uninitialized.diff
New:
----
64bit-cleanness.diff
fortify.diff
libsuffix-support.diff
rekall-2.4.5.tar.bz2
rekall-destdir.diff
rpm-opt-flags.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rekall.spec ++++++
--- /var/tmp/diff_new_pack.x11512/_old 2007-02-25 23:36:53.000000000 +0100
+++ /var/tmp/diff_new_pack.x11512/_new 2007-02-25 23:36:53.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package rekall (Version 2.2.6)
+# spec file for package rekall (Version 2.4.5)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,13 @@
Name: rekall
BuildRequires: kdelibs3-devel krb5-devel mysql-devel postgresql-devel python-devel xbsql
+BuildRequires: scons sqlite-devel
URL: http://www.rekallrevealed.org/
License: GNU General Public License (GPL)
Group: Productivity/Databases/Clients
Summary: Universal Database Application
-Version: 2.2.6
-Release: 59
+Version: 2.4.5
+Release: 1
%define rversion %version
Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`)
Requires: %name-database-backend = %version
@@ -28,12 +29,13 @@
Source3: mushroomDAT.tar.bz2
Source4: mushroomDAT_en.tar.bz2
Patch0: %name.diff
-Patch1: i18n.diff
+Patch1: rpm-opt-flags.diff
Patch2: rekall-python25.diff
-Patch3: rekall-2.2.6-gcc4.diff
-Patch4: autotools.diff
-Patch5: fix-desktop-file-location.diff
-Patch6: uninitialized.diff
+Patch3: fortify.diff
+Patch4: rekall-destdir.diff
+Patch5: 64bit-cleanness.diff
+Patch6: fix-desktop-file-location.diff
+Patch7: libsuffix-support.diff
%description
Rekall is a programmable personal database management system (DBMS). It
@@ -49,6 +51,7 @@
Provides: %name-database-backend = %version
Group: Productivity/Databases/Clients
Summary: Rekall MySQL Database Backend
+Requires: %name = %version
%description mysql
For using Rekall with a MySQL database server.
@@ -59,13 +62,14 @@
--------
Mike Richardson
-%package unisql
+%package sqlite
Provides: %name-database-backend = %version
Group: Productivity/Databases/Clients
-Summary: Rekall UniSQL Database Backend
+Summary: Rekall sqlite Database Backend
+Requires: %name = %version
-%description unisql
-For using Rekall with an UniSQL database server.
+%description sqlite
+For using Rekall with a sqlite database.
@@ -77,6 +81,7 @@
Provides: %name-database-backend = %version
Group: Productivity/Databases/Clients
Summary: Rekall PostgreSQL Database Backend
+Requires: %name = %version
%description postgresql
For using Rekall with a PostgreSQL database server.
@@ -91,7 +96,7 @@
Provides: %name-database-backend = %version
Group: Productivity/Databases/Clients
Summary: Universal Database Application
-Requires: rekall
+Requires: %name = %version
%description examples
Rekall is a programmable personal database management system (DBMS).
@@ -108,6 +113,7 @@
Provides: %name-database-backend = %version
Group: Productivity/Databases/Clients
Summary: Rekall XBase Database Backend
+Requires: %name = %version
%description xbase
XBase database back-end for Rekall.
@@ -124,30 +130,33 @@
%prep
%setup -q -n %name-%rversion
cp %SOURCE1 %SOURCE2 po/
-%patch
+#%patch
%patch1
%patch2
-%patch3 -p1
+%patch3
%patch4
%patch5
-%patch6
-. /etc/opt/kde3/common_options
-update_admin --no-unsermake
+%patch7
%build
. /etc/opt/kde3/common_options
-export CPPFLAGS="$CPPFLAGS -fno-strict-aliasing"
-./configure $configkde \
- --disable-final \
- --with-mysql-libraries=%_libdir/mysql \
- --with-pgsql-libraries=%_libdir \
- --with-xbsql-libraries=%_libdir
-do_make %{?jobs:-j%jobs}
+export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+export LIBSUFFIX=$(echo %_lib | cut -b4-)
+export PYTHONPATH="scons/"
+export REKALL_MODE="kde"
+cp scons/build/settings.kde settings.kde
+sed -i -e 's,^enable-kjs=.*,enable-kjs=no,' settings.kde
+echo "with-kde-libraries=/opt/kde3/%_lib" >> settings.kde
+echo "with-qt-libraries=/usr/lib/qt3/%_lib" >> settings.kde
+echo "with-mysql-libraries=%_libdir" >> settings.kde
+echo "with-pgsql-libraries=%_libdir" >> settings.kde
+echo "with-python-libraries=%_libdir" >> settings.kde
+echo "with-sqlite3-libraries=%_libdir" >> settings.kde
+python ./scons/rkScanner.py --make --spec=settings.kde
+scons -Q --max-drift=1 --implicit-deps-unchanged %{?jobs:-j%jobs}
+DESTDIR=%{buildroot} scons -Q install
%install
-rm -rf $RPM_BUILD_ROOT
-. /etc/opt/kde3/common_options
-make DESTDIR=${RPM_BUILD_ROOT} $INSTALL_TARGET
%if %suse_version < 1010
%suse_update_desktop_file %name Office Database
%else
@@ -159,7 +168,6 @@
install -m 0644 pics/icons/hicolor/${i}x${i}/apps/rekall.png \
${RPM_BUILD_ROOT}/opt/kde3/share/icons/crystalsvg/${i}x${i}/apps/
done
-rm $RPM_BUILD_ROOT/opt/kde3/share/doc/HTML/en/rekall/common
mkdir $RPM_BUILD_ROOT/opt/kde3/share/apps/rekall/examples
cd $RPM_BUILD_ROOT/opt/kde3/share/apps/rekall/examples
tar xvfj %SOURCE3
@@ -180,16 +188,16 @@
%postun mysql
%run_ldconfig
-%post unisql
+%post postgresql
%run_ldconfig
-%postun unisql
+%postun postgresql
%run_ldconfig
-%post postgresql
+%post sqlite
%run_ldconfig
-%postun postgresql
+%postun sqlite
%run_ldconfig
%if %suse_version > 900
@@ -203,73 +211,56 @@
%files -f %name.lang
%defattr(-,root,root)
%doc AUTHORS LICENSE
+%exclude /opt/kde3/share/apps/rekall/examples
+%exclude /opt/kde3/share/apps/rekall/services/rekall_driver_mysql.desktop
+%exclude /opt/kde3/share/apps/rekall/services/rekall_driver_pgsql.desktop
+%exclude /opt/kde3/share/apps/rekall/services/rekall_driver_sqlite3.desktop
+%exclude /opt/kde3/share/apps/rekall/services/rekall_driver_xbase.desktop
%dir /opt/kde3/share/apps/rekall
%dir /opt/kde3/share/apps/rekall/services
-%doc /opt/kde3/share/doc/HTML/en/rekallrt
/opt/kde3/bin/*
-/opt/kde3/include/rekall
-/opt/kde3/%_lib/libel_*
-/opt/kde3/%_lib/libkbase.*
-/opt/kde3/%_lib/libkbase_a*
-/opt/kde3/%_lib/libkbase_c*
-/opt/kde3/%_lib/libkbase_e*
-/opt/kde3/%_lib/libkbase_f*
-/opt/kde3/%_lib/libkbase_k*
-/opt/kde3/%_lib/libkbase_m*
-/opt/kde3/%_lib/libkbase_p*
-/opt/kde3/%_lib/libkbase_q*
-/opt/kde3/%_lib/libkbase_r*
-/opt/kde3/%_lib/libkbase_s*
-/opt/kde3/%_lib/libkbase_t*
-/opt/kde3/%_lib/libkbase_wizard.*
/opt/kde3/%_lib/librekall.*
-/opt/kde3/share/*/*/rekall.desktop
-/opt/kde3/share/apps/rekall/stock
-/opt/kde3/share/apps/rekall/script
-/opt/kde3/share/apps/rekall/rekall*
-/opt/kde3/share/apps/rekall/icons
-/opt/kde3/share/apps/rekall/help
-/opt/kde3/share/apps/rekall/highlight
-/opt/kde3/share/apps/rekall/keymap
-/opt/kde3/share/apps/rekall/pics
-/opt/kde3/share/apps/rekall/wizards
-/opt/kde3/share/apps/rekall/LICENSE
-/opt/kde3/share/apps/rekall/dict
-/opt/kde3/share/apps/rekall/services/kdeparts.lst
-/opt/kde3/share/apps/rekall/services/rekall_component.desktop
-/opt/kde3/share/apps/rekall/services/rekall_copier.desktop
-/opt/kde3/share/apps/rekall/services/rekall_dummy.desktop
-/opt/kde3/share/apps/rekall/services/rekall_editor.desktop
-/opt/kde3/share/apps/rekall/services/rekall_form.desktop
-/opt/kde3/share/apps/rekall/services/rekall_macro.desktop
-/opt/kde3/share/apps/rekall/services/rekall_plugin_extra.desktop
-/opt/kde3/share/apps/rekall/services/rekall_plugin_kde.desktop
-/opt/kde3/share/apps/rekall/services/rekall_query.desktop
-/opt/kde3/share/apps/rekall/services/rekall_report.desktop
-/opt/kde3/share/apps/rekall/services/rekall_script_py.desktop
-/opt/kde3/share/apps/rekall/services/rekall_table.desktop
+/opt/kde3/%_lib/librekall_a*
+/opt/kde3/%_lib/librekall_c*
+/opt/kde3/%_lib/librekall_driver_test*
+/opt/kde3/%_lib/librekall_driver_dbtcp*
+/opt/kde3/%_lib/librekall_e*
+/opt/kde3/%_lib/librekall_f*
+/opt/kde3/%_lib/librekall_k*
+/opt/kde3/%_lib/librekall_m*
+/opt/kde3/%_lib/librekall_p*
+/opt/kde3/%_lib/librekall_q*
+/opt/kde3/%_lib/librekall_r*
+/opt/kde3/%_lib/librekallrt*
+/opt/kde3/%_lib/librekall_s*
+/opt/kde3/%_lib/librekall_t*
+/opt/kde3/%_lib/librekall_wizard.*
+/opt/kde3/share/apps/rekall
/opt/kde3/share/apps/rekallrt
+
+%py_sitedir/rkdcop.so
/opt/kde3/share/icons/crystalsvg/*/apps
%files mysql
%defattr(-,root,root)
-/opt/kde3/%_lib/libkbase_driver_mysql.*
+/opt/kde3/%_lib/librekall_driver_mysql.*
/opt/kde3/share/apps/rekall/services/rekall_driver_mysql.desktop
-%files unisql
-%defattr(-,root,root)
-/opt/kde3/%_lib/libkbase_driver_unisql.*
-/opt/kde3/share/apps/rekall/services/rekall_driver_unisql.desktop
-
%files postgresql
%defattr(-,root,root)
-/opt/kde3/%_lib/libkbase_driver_pgsql.*
+/opt/kde3/%_lib/librekall_driver_pgsql.*
/opt/kde3/share/apps/rekall/services/rekall_driver_pgsql.desktop
%if %suse_version > 900
+%files sqlite
+%defattr(-,root,root)
+/opt/kde3/%_lib/librekall_driver_sqlite3.*
+/opt/kde3/share/apps/rekall/services/rekall_driver_sqlite3.desktop
+%if %suse_version > 900
+
%files xbase
%defattr(-,root,root)
-/opt/kde3/%_lib/libkbase_driver_xbase.*
+/opt/kde3/%_lib/librekall_driver_xbase.*
/opt/kde3/share/apps/rekall/services/rekall_driver_xbase.desktop
%endif
@@ -277,7 +268,12 @@
%defattr(-,root,root)
/opt/kde3/share/apps/rekall/examples
-%changelog -n rekall
+%changelog
+* Sat Feb 24 2007 - dmueller@suse.de
+- update to 2.4.5:
+ * Dynamic Layouts, Tool Boxes, Wizards
+ * Test Suite support
+ * Manual viewer
* Thu Feb 01 2007 - dmueller@suse.de
- avoid uninitialized variables (#232826)
* Mon Jan 08 2007 - stbinner@suse.de
++++++ 64bit-cleanness.diff ++++++
--- libs/el32/hash.cpp
+++ libs/el32/hash.cpp
@@ -145,7 +145,7 @@
/* otherwise use just the tag (pretty useless */
/* but so what, not a common case). */
if ((key.tag->flags & TF_SHARED) == 0)
- hval = (int)key.val.shared ;
+ hval = (unsigned long)key.val.shared ;
else hval = key.tag->tag ;
break ;
}
--- libs/kbase/kb_configdlg.cpp
+++ libs/kbase/kb_configdlg.cpp
@@ -312,7 +312,7 @@
old.clear () ;
QListViewItem *item = m_lvConfigs->firstChild() ;
- uint ident = 0x000ffffff & (uint)(void *)item ;
+ uint ident = 0x000ffffff & (ulong)(void *)item ;
while (item != 0)
{
--- libs/kbase/kb_overridedlg.cpp
+++ libs/kbase/kb_overridedlg.cpp
@@ -360,7 +360,7 @@
old.clear () ;
QListViewItem *item = m_lvOverride->firstChild() ;
- uint ident = 0x000ffffff & (uint)(void *)item ;
+ uint ident = 0x000ffffff & (ulong)(void *)item ;
while (item != 0)
{
--- libs/kbase/kb_stack.cpp
+++ libs/kbase/kb_stack.cpp
@@ -456,7 +456,7 @@
this,
SLOT (setCurrentPage(int)),
0,
- (int)p
+ (unsigned long)p
) ;
else
raiser->insertItem
@@ -464,7 +464,7 @@
this,
SLOT (setCurrentPage(int)),
0,
- (int)p
+ (unsigned long)p
) ;
)
++++++ fix-desktop-file-location.diff ++++++
--- /var/tmp/diff_new_pack.x11512/_old 2007-02-25 23:36:53.000000000 +0100
+++ /var/tmp/diff_new_pack.x11512/_new 2007-02-25 23:36:53.000000000 +0100
@@ -1,5 +1,5 @@
---- kbase/Makefile.am
-+++ kbase/Makefile.am
+--- kbase/Makefile.am 2005/10/25 11:48:35 1.1
++++ kbase/Makefile.am 2005/10/25 11:49:02
@@ -61,7 +61,7 @@
-rm r-f $(DESTDIR)$(kde_datadir)/rekall
++++++ fortify.diff ++++++
--- support/dbtcp/dbug.c
+++ support/dbtcp/dbug.c
@@ -203,7 +203,9 @@
IMPORT int fclose (); /* Close a stream */
IMPORT FILE *fopen (); /* Open a stream */
/*IMPORT int fprintf (); Formatted print on file */
+#ifndef vfprintf
IMPORT int vfprintf (); /* Varargs form of fprintf */
+#endif
IMPORT VOID free ();
IMPORT char *malloc (); /* Allocate memory */
IMPORT int strlen ();
++++++ libsuffix-support.diff ++++++
--- scons/rkBuilder.py
+++ scons/rkBuilder.py
@@ -108,6 +108,9 @@
try : destDir = os.environ['DESTDIR'] + '/'
except : destDir = ''
+try : libsuffixDir = os.environ['LIBSUFFIX']
+except : libsuffixDir = ''
+
if rkConfig.mode in [ 'win', 'mingw' ] :
instDir = os.path.join (os.getcwd(), 'RekallWin')
binDir = destDir + instDir
@@ -131,9 +134,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, 'lib') + libsuffixDir
pyLibDir = destDir + os.path.join (rkConfig.pythonLibDir, rkConfig.pythonLib, 'site-packages')
- pluginDir = destDir + os.path.join (instDir, 'lib')
+ pluginDir = destDir + os.path.join (instDir, 'lib') + libsuffixDir
appDir = destDir + os.path.join (instDir, 'share', 'apps', rkConfig.appName)
rekallServicesDir = os.path.join (appDir, 'services')
rekallGUIDir = os.path.join (appDir, 'gui')
@@ -141,9 +144,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, 'lib') + libsuffixDir
pyLibDir = destDir + os.path.join (rkConfig.pythonLibDir, rkConfig.pythonLib, 'site-packages')
- pluginDir = destDir + os.path.join (instDir, 'lib')
+ pluginDir = destDir + os.path.join (instDir, 'lib') + libsuffixDir
appDir = destDir + os.path.join (instDir, 'share', 'apps', rkConfig.appName)
rekallServicesDir = os.path.join (appDir, 'services')
rekallGUIDir = os.path.join (appDir, 'gui')
++++++ rekall-2.2.6.tar.bz2 -> rekall-2.4.5.tar.bz2 ++++++
KDE/rekall/rekall-2.2.6.tar.bz2 /mounts/work_src_done/STABLE/rekall/rekall-2.4.5.tar.bz2 differ: byte 11, line 1
++++++ rekall-destdir.diff ++++++
--- doc/rekall/SConscript
+++ doc/rekall/SConscript
@@ -194,7 +194,7 @@
if rkConfig.meinproc and rkConfig.kdedocdir :
- enDir = rkConfig.kdedocdir + '/en/' + rkConfig.appName
+ enDir = os.environ['DESTDIR'] + '/' + rkConfig.kdedocdir + '/en/' + rkConfig.appName
ins.Alias ('install', pyEnv.Install (enDir, 'index.cache.bz2'))
ins.Alias ('install', pyEnv.Install (enDir, 'index.docbook' ))
++++++ rekall.diff ++++++
--- /var/tmp/diff_new_pack.x11512/_old 2007-02-25 23:36:54.000000000 +0100
+++ /var/tmp/diff_new_pack.x11512/_new 2007-02-25 23:36:54.000000000 +0100
@@ -1,5 +1,5 @@
--- kbase/rekall.desktop
-+++ kbase/rekall.desktop
++++ kbase/rekall.desktop 2004/04/28 11:44:37
@@ -2,7 +2,7 @@
[KDE Desktop Entry]
Type=Application
@@ -9,65 +9,8 @@
DocPath=rekall/index.html
Comment=
Comment[de]=
---- script/python/lib-2.2.0/Makefile.am
-+++ script/python/lib-2.2.0/Makefile.am
-@@ -45,15 +45,14 @@
- ../../../libs/common/libkbase_common.la \
- ../../../libs/app/libkbase_app.la \
- ../../../libs/tkwidgets/libkbase_tkwidgets.la \
-- -lkbase_python2.2 \
-+ ../../../python/Python-2.2.0/libkbase_python2.2.la \
- $(PYTHONLIBDB) $(LIBQT) -lpthread -lutil
- # ../../../sip/siplib-2.2.0/libkbase_siplib22.la
-
-
- libkbase_script_py22_la_LDFLAGS = \
- $(all_libraries) \
-- $(KDE_PLUGIN) $(GUILIBS) -version-info 0:7:0 \
-- -L../../../python/Python-2.2.0
-+ $(KDE_PLUGIN) $(GUILIBS) -version-info 0:7:0
-
- uninstall-local:
-
-@@ -65,7 +64,6 @@
- -I$(srcdir)/../../../libs/app \
- -I$(srcdir)/../../../libs/$(PORTDIR) \
- -I$(srcdir)/../../../libs/tkwidgets \
-- -I/usr/include/python2.3 \
- $(all_includes)
- # -I$(srcdir)/../../../python/Python-2.2.0
- # -I$(srcdir)/../../../python/Python-2.2.0/Include
---- script/python/lib-2.2.0_rt/Makefile.am
-+++ script/python/lib-2.2.0_rt/Makefile.am
-@@ -44,13 +44,12 @@
- ../../../libs/app_rt/libkbasert_app.la \
- ../../../libs/tkwidgets/libkbase_tkwidgets.la \
- ../../../sip/siplib-2.2.0/libkbase_siplib22.la \
-- -lkbase_python2.2 \
-+ ../../../python/Python-2.2.0/libkbase_python2.2.la \
- $(PYTHONLIBDB) $(LIBQT) -lpthread -lutil
-
- libkbasert_script_py22_la_LDFLAGS = \
- $(all_libraries) \
-- $(KDE_PLUGIN) $(GUILIBS) -version-info 0:7:0 \
-- -L../../../python/Python-2.2.0
-+ $(KDE_PLUGIN) $(GUILIBS) -version-info 0:7:0
-
- uninstall-local:
-
---- script/python/lib-sys/Makefile.am
-+++ script/python/lib-sys/Makefile.am
-@@ -60,7 +60,7 @@
-
- uninstall-local:
-
--AM_CPPFLAGS = $(PARTDEF) $(GUIDEFS) $(EXFLAGS) -D__KB_RUNTIME=0
-+AM_CPPFLAGS = $(PARTDEF) $(GUIDEFS) $(EXFLAGS) -D__KB_RUNTIME=0 -fno-strict-aliasing
-
- INCLUDES = \
- -I$(srcdir)/../../../libs/kbase \
--- script/python/lib-sys/kb_basic.cpp
-+++ script/python/lib-sys/kb_basic.cpp
++++ script/python/lib-sys/kb_basic.cpp 2004/04/28 11:44:37
@@ -229,7 +229,7 @@
return Py_None ;
}
@@ -77,30 +20,19 @@
PyArg_ParseTuple (args, _C("s"), &msg) ;
return deb->debugHook (PyEval_GetFrame(), msg) ;
---- script/python/lib-sys/kb_pysupport.cpp
-+++ script/python/lib-sys/kb_pysupport.cpp
-@@ -25,7 +25,7 @@
- {
- PyObject *key ;
- PyObject *value ;
-- int pos = 0 ;
-+ ssize_t pos = 0 ;
-
- kbDict.setAutoDelete (true) ;
-
---- script/python/lib-sys/tkc_pydebugbase.cpp
-+++ script/python/lib-sys/tkc_pydebugbase.cpp
-@@ -1042,7 +1042,7 @@
- {
- PyObject *pkey ;
- PyObject *pvalue ;
-- int dictPos = 0 ;
-+ ssize_t dictPos = 0 ;
+--- script/python/lib-sys/Makefile.am
++++ script/python/lib-sys/Makefile.am 2004/04/27 08:42:08
+@@ -59,7 +59,7 @@
+
+ uninstall-local:
- while (PyDict_Next (pyDict, &dictPos, &pkey, &pvalue))
- tkcDict.insert
+-AM_CPPFLAGS = $(PARTDEF) $(GUIDEFS) $(EXFLAGS) -D__KB_RUNTIME=0
++AM_CPPFLAGS = $(PARTDEF) $(GUIDEFS) $(EXFLAGS) -D__KB_RUNTIME=0 -fno-strict-aliasing
+
+ INCLUDES = \
+ -I$(srcdir)/../../../libs/kbase \
--- script/python/lib-sys/tkc_pydebugbase.h
-+++ script/python/lib-sys/tkc_pydebugbase.h
++++ script/python/lib-sys/tkc_pydebugbase.h 2004/04/28 11:44:37
@@ -16,6 +16,8 @@
#include "kb_python.h"
@@ -110,27 +42,3 @@
#if (PY_MAJOR_VERSION > 2)
#define __PY22PLUS 1
#endif
---- script/python/lib-sys/tkc_pyvaluelist.cpp
-+++ script/python/lib-sys/tkc_pyvaluelist.cpp
-@@ -187,7 +187,7 @@
- ADDSUBVAL ("Locals", frame->f_locals ) ;
- ADDSUBVAL ("Code", frame->f_code ) ;
-
--#if __PY22PLUS
-+#if 0
- PyObject *floc ;
- PyObject *map = frame->f_code->co_varnames ;
-
---- sip/siplib-2.2.0/Makefile.am
-+++ sip/siplib-2.2.0/Makefile.am
-@@ -5,8 +5,8 @@
- qtlib.cpp \
- siplib.c
-
--libkbase_siplib22_la_LIBADD = -lkbase_python2.2
--libkbase_siplib22_la_LDFLAGS = $(all_libraries) -version-info 0:7:0 -L../../python/Python-2.2.0
-+libkbase_siplib22_la_LIBADD = ../../python/Python-2.2.0/libkbase_python2.2.la
-+libkbase_siplib22_la_LDFLAGS = $(all_libraries) -version-info 0:7:0
- libkbase_siplib22_la_METASOURCES = AUTO
-
- EXFLAGS = -DHAVE_STDARG_PROTOTYPES -DHAVE_PROTOTYPES
++++++ rekall-python25.diff ++++++
--- /var/tmp/diff_new_pack.x11512/_old 2007-02-25 23:36:54.000000000 +0100
+++ /var/tmp/diff_new_pack.x11512/_new 2007-02-25 23:36:54.000000000 +0100
@@ -1,42 +1,64 @@
---- configure.in.in
-+++ configure.in.in
-@@ -85,6 +85,10 @@
- USESYSPY=1
- ;;
-
-+ 2.5) SYSPYVER="2.5"
-+ USESYSPY=1
-+ ;;
-+
- *) AC_MSG_ERROR([Unrecognised python version: $pyver])
- ;;
- esac
---- script/python/lib-sys/tkc_pydebugbase.cpp
-+++ script/python/lib-sys/tkc_pydebugbase.cpp
-@@ -550,7 +550,7 @@
- if (PyModule_Check (pyObj) || PyCode_Check (pyObj))
- if (findTracePoint (pyObj, lineNo) == 0)
- {
-- fprintf (stderr, "Set trace: %08x:%d\n", (uint)pyObj, lineNo) ;
-+ fprintf (stderr, "Set trace: %p:%d\n", pyObj, lineNo) ;
- tracePoints.append (new TKCPyTracePoint (pyObj, userPtr, lineNo)) ;
- enable () ;
- }
-@@ -573,7 +573,7 @@
- if (PyModule_Check (pyObj) || PyCode_Check (pyObj))
- if ((tp = findTracePoint (pyObj, lineNo)) != 0)
+--- script/python/kb_basic.cpp
++++ script/python/kb_basic.cpp
+@@ -400,7 +400,7 @@
+ QStringList pairs ;
+ PyObject *key ;
+ PyObject *value ;
+- int pos = 0 ;
++ Py_ssize_t pos = 0 ;
+
+ //xxx use pickle or marshal to create the data representation instead
+ //xxx of a simple string representation?
+--- script/python/kb_pycontainer.cpp
++++ script/python/kb_pycontainer.cpp
+@@ -60,7 +60,7 @@
+ }
+
+ char *buffer ;
+- int len ;
++ Py_ssize_t len ;
+ PyString_AsStringAndSize (pyImage, &buffer, &len) ;
+
+ QByteArray ba ;
+--- script/python/kb_pysupport.cpp
++++ script/python/kb_pysupport.cpp
+@@ -37,7 +37,7 @@
+ {
+ PyObject *key ;
+ PyObject *value ;
+- int pos = 0 ;
++ Py_ssize_t pos = 0 ;
+
+ kbDict.setAutoDelete (true) ;
+
+--- script/python/tkc_pydebugbase.cpp
++++ script/python/tkc_pydebugbase.cpp
+@@ -1082,7 +1082,7 @@
+ {
+ PyObject *pkey ;
+ PyObject *pvalue ;
+- int dictPos = 0 ;
++ Py_ssize_t dictPos = 0 ;
+
+ while (PyDict_Next (pyDict, &dictPos, &pkey, &pvalue))
{
-- fprintf (stderr, "Rem trace: %08x:%d\n", (uint)pyObj, lineNo) ;
-+ fprintf (stderr, "Rem trace: %p:%d\n", pyObj, lineNo) ;
- tracePoints.remove (tp) ;
- delete tp ;
- disable () ;
-@@ -1089,7 +1089,7 @@
+@@ -1135,7 +1135,7 @@
PyObject *pyKey ;
PyObject *pyValue ;
QString name ;
- int dictPos = 0 ;
-+ ssize_t dictPos = 0 ;
++ Py_ssize_t dictPos = 0 ;
/* See if we have been here before, in which case there is no */
/* point in going there again. This also prevents infinite */
+--- script/python/tkc_pyvaluelist.cpp
++++ script/python/tkc_pyvaluelist.cpp
+@@ -180,7 +180,7 @@
+ ADDSUBVAL ("Locals", frame->f_locals ) ;
+ ADDSUBVAL ("Code", frame->f_code ) ;
+
+-#if __PY22PLUS
++#if 0
+ PyObject *floc ;
+ PyObject *map = frame->f_code->co_varnames ;
+
++++++ rpm-opt-flags.diff ++++++
--- scons/rkBuilder.py
+++ scons/rkBuilder.py
@@ -470,6 +470,8 @@
if self.m_build not in [ buildMAC, buildWIN ] :
self.addLFlags ('-Wl,--no-undefined')
self.addCFlags ('-Wall')
+ for i in os.environ['RPM_OPT_FLAGS'].split():
+ self.addCFlags (i)
if self.m_build in [ buildMAC ] :
if self.m_type == typeSharedLib :
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org