Hello community, here is the log from the commit of package kio-locate checked in at Fri Apr 25 16:29:16 CEST 2008. -------- --- KDE/kio-locate/kio-locate.changes 2006-05-28 13:38:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/kio-locate/kio-locate.changes 2008-04-25 10:57:19.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 25 10:57:07 CEST 2008 - dmueller@suse.de + +- switch away from system scons to fix the build + +------------------------------------------------------------------- Old: ---- kio-locate_0.4.5.tar.gz New: ---- disable-doc.diff kio-locate_0.4.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kio-locate.spec ++++++ --- /var/tmp/diff_new_pack.q10389/_old 2008-04-25 16:29:12.000000000 +0200 +++ /var/tmp/diff_new_pack.q10389/_new 2008-04-25 16:29:12.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package kio-locate (Version 0.4.5) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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. # @@ -10,22 +10,24 @@ # norootforbuild + Name: kio-locate -BuildRequires: kdelibs3-devel python-xml scons +BuildRequires: kdelibs3-devel python-xml %if %suse_version < 1010 BuildRequires: kdelibs3-doc %endif -URL: http://arminstraub.de/browse.php?page=programs_kiolocate -License: GPL +Url: http://arminstraub.com/browse.php?page=programs_kiolocate +License: GPL v2 or later Group: Productivity/Other -Autoreqprov: on +AutoReqProv: on Version: 0.4.5 -Release: 1 +Release: 183 Summary: KDE I/O Slave for the locate Command -Source: kio-locate_%version.tar.gz +Source: kio-locate_%version.tar.bz2 Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) findutils-locate BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch1: fix-bksys-libsuffix.diff +Patch2: disable-doc.diff %description You can use kio-locate mostly as you use locate. Instead of typing @@ -45,21 +47,32 @@ %prep %setup -q %patch1 +%patch2 +mv doc .doc . /etc/opt/kde3/common_options %build QTDIR_bak=$QTDIR . /etc/opt/kde3/common_options export QTDIR=$QTDIR_bak +# the system version does not work +tar xf admin/scons-mini.tar.bz2 %ifarch x86_64 ppc64 s390x -scons libsuffix=64 +./scons libsuffix=64 %else -scons +./scons %endif %install . /etc/opt/kde3/common_options -scons DESTDIR=%{buildroot} install +./scons DESTDIR=%{buildroot} install +#install help manually as the scons install target does not work +for f in .doc/en/*; do + install -D $f -m 644 %{buildroot}/opt/kde3/share/doc/HTML/en/kio-locate/${f##*/} +done +pushd %{buildroot}/opt/kde3/share/doc/HTML/en/kio-locate + meinproc --cache index.cache.bz2 index.docbook +popd %find_lang kio-locate %files @@ -72,24 +85,26 @@ %dir /opt/kde3/share/services/searchproviders /opt/kde3/share/services/searchproviders/locate.desktop -%changelog -n kio-locate -* Sun May 28 2006 - stbinner@suse.de +%changelog +* Fri Apr 25 2008 dmueller@suse.de +- switch away from system scons to fix the build +* Sun May 28 2006 stbinner@suse.de - update to version 0.4.5 * Search hits with non-ascii characters in the file name always showed up with invalid size/owner/group information * kio-locate should now compile with gcc-4.1_beta * Updated to bksys 1.5.1. -* Wed May 24 2006 - adrian@suse.de +* Wed May 24 2006 adrian@suse.de - fix build for < 10.1 -* Sun Feb 19 2006 - dmueller@suse.de +* Sun Feb 19 2006 dmueller@suse.de - fix build for ppc,s390x -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Wed Oct 19 2005 - stbinner@suse.de +* Wed Oct 19 2005 stbinner@suse.de - update to version 0.4.4 -* Tue Oct 18 2005 - stbinner@suse.de +* Tue Oct 18 2005 stbinner@suse.de - fix build for 64 bit -* Sat Oct 08 2005 - coolo@suse.de +* Sat Oct 08 2005 coolo@suse.de - fix build with gcc 4.1 -* Wed Oct 05 2005 - stbinner@suse.de +* Wed Oct 05 2005 stbinner@suse.de - initial package (version 0.4.3) ++++++ disable-doc.diff ++++++ --- SConstruct +++ SConstruct @@ -64,7 +64,7 @@ myenv=env.Copy() ## Use docfolder for each documentation directory ## The parameters of docfolder are: documentation dir, language code, app name -myenv.docfolder('doc/en/', 'en', 'kio-locate/') +#myenv.docfolder('doc/en/', 'en', 'kio-locate/') #myenv.docfolder('doc/fr/', 'fr', 'kio-locate/') ############################ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org