Hello community, here is the log from the commit of package katalog checked in at Thu Oct 16 01:33:29 CEST 2008. -------- --- KDE/katalog/katalog.changes 2008-06-02 23:31:13.000000000 +0200 +++ /d/STABLE/katalog/katalog.changes 2008-10-15 10:10:59.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Oct 15 10:10:49 CEST 2008 - dmueller@suse.de + +- fix build after python 2.6 update + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- scons-mini.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ katalog.spec ++++++ --- /var/tmp/diff_new_pack.qb6636/_old 2008-10-16 01:32:18.000000000 +0200 +++ /var/tmp/diff_new_pack.qb6636/_new 2008-10-16 01:32:18.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package katalog (Version 0.4) # # 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/ # @@ -18,10 +25,11 @@ Group: Productivity/File utilities Summary: Create Catalog Files from Media and Search Them Version: 0.4 -Release: 161 +Release: 205 Source0: %name-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch: katalog-gcc43.diff +Patch1: scons-mini.diff %description Katalog integrates into Konqueror and allows the creation of .katalog @@ -46,13 +54,16 @@ QTDIR_bak=$QTDIR . /etc/opt/kde3/common_options export QTDIR=$QTDIR_bak +tar xf admin/scons-mini.tar.bz2 +patch -p0 -s < %{PATCH1} +export SCONS=./scons ./configure %ifarch x86_64 ppc64 s390x -./scons configure libdir=%_libdir qtlibs=/usr/lib/qt3/%_lib libsuffix=64 +$SCONS configure libdir=%_libdir qtlibs=/usr/lib/qt3/%_lib libsuffix=64 %else -./scons configure libdir=%_libdir qtlibs=/usr/lib/qt3/%_lib +$SCONS configure libdir=%_libdir qtlibs=/usr/lib/qt3/%_lib %endif -./scons . +$SCONS . %install . /etc/opt/kde3/common_options @@ -83,6 +94,8 @@ /opt/kde3/share/services/* %changelog +* Wed Oct 15 2008 dmueller@suse.de +- fix build after python 2.6 update * Tue Jun 03 2008 dmueller@suse.de - fix build * Fri Apr 25 2008 dmueller@suse.de ++++++ scons-mini.diff ++++++ --- scons-local-0.96.1/SCons/Tool/_as.py +++ scons-local-0.96.1/SCons/Tool/_as.py @@ -0,0 +1,24 @@ +import SCons.Defaults +import SCons.Tool +import SCons.Util +assemblers=['as'] +ASSuffixes=['.s', '.asm', '.ASM'] +ASPPSuffixes=['.spp', '.SPP'] +if SCons.Util.case_sensitive_suffixes('.s', '.S'): + ASPPSuffixes.extend(['.S']) +else: + ASSuffixes.extend(['.S']) +def generate(env): + static_obj, shared_obj=SCons.Tool.createObjBuilders(env) + for suffix in ASSuffixes: + static_obj.add_action(suffix, SCons.Defaults.ASAction) + static_obj.add_emitter(suffix, SCons.Defaults.StaticObjectEmitter) + for suffix in ASPPSuffixes: + static_obj.add_action(suffix, SCons.Defaults.ASPPAction) + static_obj.add_emitter(suffix, SCons.Defaults.StaticObjectEmitter) + env['AS'] =env.Detect(assemblers) or 'as' + env['ASFLAGS'] =SCons.Util.CLVar('') + env['ASCOM'] ='$AS $ASFLAGS -o $TARGET $SOURCES' + env['ASPPCOM'] ='$CC $ASFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -c -o $TARGET $SOURCES' +def exists(env): + return env.Detect(assemblers) --- scons-local-0.96.1/SCons/Tool/gas.py +++ scons-local-0.96.1/SCons/Tool/gas.py @@ -1,7 +1,7 @@ -import as +import _as assemblers=['as', 'gas'] def generate(env): - as.generate(env) + _as.generate(env) env['AS'] =env.Detect(assemblers) or 'as' def exists(env): return env.Detect(assemblers) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de