Hello community, here is the log from the commit of package amarok for openSUSE:Factory checked in at 2011-12-21 09:59:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/amarok (Old) and /work/SRC/openSUSE:Factory/.amarok.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "amarok", Maintainer is "kde-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/amarok/amarok.changes 2011-12-13 11:48:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.amarok.new/amarok.changes 2011-12-21 09:59:05.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Dec 20 15:48:16 UTC 2011 - adr...@suse.de + +- Update to final version 2.5.0 + * Mainly bugfixes since Beta 1, check the ChangeLog file for details + +------------------------------------------------------------------- Old: ---- amarok-2.4.90.tar.bz2 amarok-fix-infinite-loop-eating-CPU.diff New: ---- amarok-2.5.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amarok.spec ++++++ --- /var/tmp/diff_new_pack.smVhNp/_old 2011-12-21 09:59:09.000000000 +0100 +++ /var/tmp/diff_new_pack.smVhNp/_new 2011-12-21 09:59:09.000000000 +0100 @@ -19,14 +19,14 @@ %bcond_with ffmpeg Name: amarok -Version: 2.4.90 +Version: 2.5.0 Release: 0 Summary: Media Player for KDE License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Players Url: http://amarok.kde.org/ -Source0: ftp://ftp.kde.org/pub/kde/unstable/amarok/%{version}/src/%{name}-%{version}.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/stable/%{name}/%{version}/src/%{name}-%{version}.tar.bz2 # PATCH-FIX-OPENSUSE errmsg-mysql51-embedded.diff -- Don't require errmsg.sys from mysql package Patch0: errmsg-mysql-embedded.diff # PATCH-FEATURE-OPENSUSE ksuseinstall.diff llu...@novell.com -- Support for on-demand codecs install using ksuseinstall @@ -35,8 +35,6 @@ Patch2: initial-preference.diff # PATCH-FIX-OPENSUSE flac_mimetype_bnc671581.diff bnc#671581 ctri...@gmx.net -- Support for the changed mimetype for flac files Patch3: flac_mimetype_bnc671581.diff -# PATCH-FIX-UPSTREAM amarok-fix-infinite-loop-eating-CPU.diff bnc#733421 m...@suse.com -- Fix infinite loop in context view eating CPU until main window is shown -Patch4: amarok-fix-infinite-loop-eating-CPU.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # Required for the fdupes macro @@ -96,7 +94,6 @@ %if 0%{?suse_version} > 1130 %patch3 %endif -%patch4 -p1 # Remove build time references so build-compare can do its work FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') ++++++ amarok-2.4.90.tar.bz2 -> amarok-2.5.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/amarok/amarok-2.4.90.tar.bz2 /work/SRC/openSUSE:Factory/.amarok.new/amarok-2.5.0.tar.bz2 differ: char 11, line 1 ++++++ errmsg-mysql-embedded.diff ++++++ --- /var/tmp/diff_new_pack.smVhNp/_old 2011-12-21 09:59:09.000000000 +0100 +++ /var/tmp/diff_new_pack.smVhNp/_new 2011-12-21 09:59:09.000000000 +0100 @@ -1,7 +1,7 @@ -Index: amarok-2.4.3/src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp +Index: amarok-2.5.0/src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp =================================================================== ---- amarok-2.4.3.orig/src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp -+++ amarok-2.4.3/src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp +--- amarok-2.5.0.orig/src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp ++++ amarok-2.5.0/src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp @@ -65,6 +65,7 @@ MySqlEmbeddedStorage::MySqlEmbeddedStora // functions, such as FULLTEXT indexing. out << "default-storage-engine = MyISAM" << endl; ++++++ flac_mimetype_bnc671581.diff ++++++ --- /var/tmp/diff_new_pack.smVhNp/_old 2011-12-21 09:59:09.000000000 +0100 +++ /var/tmp/diff_new_pack.smVhNp/_new 2011-12-21 09:59:09.000000000 +0100 @@ -1,6 +1,8 @@ ---- src/amarok.desktop 2011-01-11 16:58:05.000000000 +0100 -+++ src/amarok.desktop_patched 2011-02-15 21:44:08.000000000 +0100 -@@ -183,7 +183,7 @@ +Index: src/amarok.desktop +=================================================================== +--- src/amarok.desktop.orig ++++ src/amarok.desktop +@@ -183,7 +183,7 @@ Comment[zh_TW]=Amarok - 重新探索您� Icon=amarok # Add pure audio formats here, for other formats see amarok_*.desktop files # See bug 242292 @@ -8,4 +10,4 @@ +MimeType=audio/aac;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/flac;audio/x-mp3;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav;application/x-ogm-audio;audio/x-vorbis+ogg;audio/ogg; X-DocPath=amarok/index.html X-KDE-Keywords=music,podcast - X-KDE-Protocols=http + X-KDE-Keywords[el]=μουσική,podcast ++++++ initial-preference.diff ++++++ --- /var/tmp/diff_new_pack.smVhNp/_old 2011-12-21 09:59:09.000000000 +0100 +++ /var/tmp/diff_new_pack.smVhNp/_new 2011-12-21 09:59:09.000000000 +0100 @@ -2,9 +2,9 @@ =================================================================== --- src/amarok.desktop.orig +++ src/amarok.desktop -@@ -187,5 +187,6 @@ - X-DocPath=amarok/index.html - X-KDE-Keywords=music,podcast +@@ -196,5 +196,6 @@ X-KDE-Keywords[uk]=music,podcast,муз� + X-KDE-Keywords[x-test]=xxmusic,podcastxx + X-KDE-Keywords[zh_TW]=music,podcast X-KDE-Protocols=http +InitialPreference=5 Terminal=false -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
