Hello community, here is the log from the commit of package k3b checked in at Fri Apr 6 00:20:42 CEST 2007. -------- --- KDE/k3b/k3b.changes 2007-04-03 22:48:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/k3b/k3b.changes 2007-04-05 12:40:02.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 5 12:39:50 CEST 2007 - stbinner@suse.de + +- fix detection of "sox" (#260118) + +------------------------------------------------------------------- New: ---- sox-detection.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ k3b.spec ++++++ --- /var/tmp/diff_new_pack.c12914/_old 2007-04-06 00:18:53.000000000 +0200 +++ /var/tmp/diff_new_pack.c12914/_new 2007-04-06 00:18:53.000000000 +0200 @@ -31,7 +31,7 @@ Summary: A Universal CD and DVD Burning Application Requires: /usr/bin/cdrecord /usr/bin/mkisofs /usr/bin/cdrdao dvd+rw-tools Version: 1.0 -Release: 8 +Release: 9 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %name-%version.tar.bz2 Source1: %name-i18n-%version.tar.bz2 @@ -46,6 +46,7 @@ Patch9: %name-fix_mountpoint.diff Patch10: install-dvd-desktops.diff Patch11: k3binterferingsystemshandler.diff +Patch12: sox-detection.diff %if %suse_version > 930 Requires: hal-resmgr %endif @@ -108,6 +109,7 @@ #%patch9 %patch10 #%patch11 +%patch12 cp %{SOURCE3} src/konqi/ . /etc/opt/kde3/common_options update_admin @@ -220,6 +222,8 @@ %endif %changelog +* Thu Apr 05 2007 - stbinner@suse.de +- fix detection of "sox" (#260118) * Tue Apr 03 2007 - stbinner@suse.de - adapt build requires for people without needed_package.fixes magic * Tue Apr 03 2007 - stbinner@suse.de ++++++ sox-detection.diff ++++++ --- plugins/encoder/sox/k3bsoxencoder.cpp 2007/04/05 11:06:28 1.1 +++ plugins/encoder/sox/k3bsoxencoder.cpp 2007/04/05 11:07:06 @@ -73,10 +73,10 @@ vp << path << "-h"; if( vp.start( KProcess::Block, KProcess::AllOutput ) ) { - int pos = out.output().find( "sox: Version" ); + int pos = out.output().find( "sox: SoX Version" ); int endPos = out.output().find( "\n", pos ); if( pos > 0 && endPos > 0 ) { - pos += 13; + pos += 17; bin = new K3bExternalBin( this ); bin->path = path; bin->version = out.output().mid( pos, endPos-pos ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org