![](https://seccdn.libravatar.org/avatar/af22e20b6884acbc89be6d7736c43e92.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package amarok checked in at Sun Nov 19 22:07:32 CET 2006. -------- --- KDE/amarok/amarok.changes 2006-11-17 11:57:44.000000000 +0100 +++ /mounts/work_src_done/STABLE/amarok/amarok.changes 2006-11-19 20:35:46.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Nov 19 20:22:52 CET 2006 - schwab@suse.de + +- Remove table from lyrics. +- Do proper quoting in shell command. + +------------------------------------------------------------------- New: ---- lyrics_lyrc.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amarok.spec ++++++ --- /var/tmp/diff_new_pack.RJmadv/_old 2006-11-19 22:06:23.000000000 +0100 +++ /var/tmp/diff_new_pack.RJmadv/_new 2006-11-19 22:06:23.000000000 +0100 @@ -29,7 +29,7 @@ Group: Productivity/Multimedia/Sound/Players Summary: Media Player for KDE Version: 1.4.4 -Release: 22 +Release: 24 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define mversion 0.5 Source0: %name-%version.tar.bz2 @@ -40,6 +40,7 @@ Patch3: amarok-no-realaudio.diff Patch4: magnatunebrowser.diff Patch5: update-groupby.diff +Patch6: lyrics_lyrc.diff Patch7: amarok-collectionscanner.diff Patch10: default-engine.diff @@ -137,6 +138,7 @@ %patch4 popd %patch5 +%patch6 %patch7 %patch10 cp %{S:10} amarok/src/engine/helix/ @@ -261,6 +263,9 @@ %endif %changelog -n amarok +* Sun Nov 19 2006 - schwab@suse.de +- Remove table from lyrics. +- Do proper quoting in shell command. * Fri Nov 17 2006 - coolo@suse.de - update settings correctly (#221762) * Tue Nov 07 2006 - dmueller@suse.de ++++++ default-engine.diff ++++++ --- /var/tmp/diff_new_pack.RJmadv/_old 2006-11-19 22:06:23.000000000 +0100 +++ /var/tmp/diff_new_pack.RJmadv/_new 2006-11-19 22:06:23.000000000 +0100 @@ -1,6 +1,6 @@ --- amarok/src/engine/helix/amarok_helixengine_plugin.desktop +++ amarok/src/engine/helix/amarok_helixengine_plugin.desktop -@@ -77,7 +77,7 @@ +@@ -78,7 +78,7 @@ X-KDE-Amarok-name=helix-engine X-KDE-Amarok-authors=Paul Cifarelli X-KDE-Amarok-email=paul@cifarelli.net ++++++ lyrics_lyrc.diff ++++++ --- amarok/src/scripts/lyrics_lyrc/lyrics_lyrc.rb +++ amarok/src/scripts/lyrics_lyrc/lyrics_lyrc.rb @@ -20,10 +20,9 @@ def showLyrics( lyrics ) # Important, otherwise we might execute arbitrary nonsense in the DCOP call - lyrics.gsub!( '"', "'" ) - lyrics.gsub!( '`', "'" ) + lyrics.gsub!( "'", "'\\\\''" ) - `dcop amarok contextbrowser showLyrics "#{lyrics}"` + `dcop amarok contextbrowser showLyrics '#{lyrics}'` end @@ -141,6 +140,7 @@ lyrics.gsub!( /<[aA][^>]*>[^<]*<\/[aA]>/, "" ) lyrics.gsub!( /<[sS][cC][rR][iI][pP][tT][^>]*>[^<]*( Reply
participants (1)
-
root@suse.de