Hello community,
here is the log from the commit of package amarok for openSUSE:Factory
checked in at Mon Jul 19 20:38:16 CEST 2010.
--------
--- KDE/amarok/amarok.changes 2010-06-25 11:39:52.000000000 +0200
+++ /mounts/work_src_done/STABLE/amarok/amarok.changes 2010-07-17 13:15:58.000000000 +0200
@@ -1,0 +2,15 @@
+Sat Jul 17 11:14:57 UTC 2010 - reddwarf@opensuse.org
+
+- Remove optional libmp4v2-devel dependency. Not needed anymore.
+
+-------------------------------------------------------------------
+Fri Jun 25 10:18:54 UTC 2010 - tittiatcoke@gmail.com
+
+- Update to 2.3.1 Final
+ * Automated Playlist Generator
+ * New Applets for Context View (Upcoming Events & Similar Artists)
+ * Many improvements for Cover Fetching
+ * support for the new System Tray Protocol
+ * See http://amarok.kde.org/en/releases/2.3.1
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
amarok-2.3.0.tar.bz2
info-applet-fix.diff
New:
----
amarok-2.3.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ amarok.spec ++++++
--- /var/tmp/diff_new_pack.65bq5W/_old 2010-07-19 20:38:02.000000000 +0200
+++ /var/tmp/diff_new_pack.65bq5W/_new 2010-07-19 20:38:02.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package amarok (Version 2.3.0)
+# spec file for package amarok (Version 2.3.1)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -17,7 +17,6 @@
# norootforbuild
-%bcond_with mp4
Name: amarok
BuildRequires: cups-devel libkcddb4-devel mysql ruby-devel sqlite-devel taglib-devel
@@ -29,31 +28,27 @@
BuildRequires: libmysqlclient-devel libqca2-devel
BuildRequires: qt4-qtscript taglib-extras-devel
BuildRequires: libgpod-devel >= 0.7.0
+%if %suse_version > 1120 || !0%{?kde_updatedapps}
BuildRequires: liblastfm-devel
-%if %suse_version > 1120
BuildRequires: libksuseinstall-devel
%endif
%if %suse_version > 1110
BuildRequires: libmysqld-devel
%endif
-%if %{with mp4}
-BuildRequires: libmp4v2-devel
-%endif
# Required for the fdupes macro
BuildRequires: fdupes
Url: http://amarok.kde.org
License: GPLv2+
Group: Productivity/Multimedia/Sound/Players
Summary: Media Player for KDE
-Version: 2.3.0
-Release: 5
+Version: 2.3.1
+Release: 1
Source0: %{name}-%{version}.tar.bz2
Source100: %{name}-rpmlintrc
Patch3: errmsg-mysql-embedded.diff
Patch4: errmsg-mysql51-embedded.diff
# PATCH-FIX-OPENSUSE no_buildtime.patch cmorve69@yahoo.es -- Remove build time from code so build-compare can make its work
Patch5: no_buildtime.patch
-Patch6: info-applet-fix.diff
Patch7: ksuseinstall.diff
Patch8: initial-preference.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -97,8 +92,7 @@
%patch3
%endif
%patch5 -p0
-%patch6 -p0
-%if %suse_version > 1120
+%if %suse_version > 1120 || !0%{?kde_updatedapps}
%patch7 -p1
%endif
%patch8
@@ -146,6 +140,7 @@
%_kde4_modules/amarok_*
%_kde4_modules/kcm_amarok_service_*
%_libdir/libamaroklib.so.*
+%_libdir/libamarokcore.so.*
%_libdir/libamarokpud.so.*
%_libdir/libamarokocsclient.so.*
%_libdir/libamarok-sqlcollection.so.*
@@ -169,13 +164,13 @@
%_kde_share_dir/services/amarok-*
%_kde_share_dir/services/amarok_*
%_kde_share_dir/services/amarok.protocol
-%_kde_share_dir/services/amaroklastfm.protocol
-%_kde_share_dir/services/amarokitpc.protocol
+%_kde_share_dir/services/amarok*.protocol
%_kde_share_dir/services/ServiceMenus/amarok_append.desktop
%files devel
%defattr(-,root,root)
%{_libdir}/libamaroklib.so
+%{_libdir}/libamarokcore.so
%{_libdir}/libamarokpud.so
%{_libdir}/libamarokocsclient.so
%{_libdir}/libamarok-sqlcollection.so
++++++ amarok-2.3.0.tar.bz2 -> amarok-2.3.1.tar.bz2 ++++++
KDE/amarok/amarok-2.3.0.tar.bz2 /mounts/work_src_done/STABLE/amarok/amarok-2.3.1.tar.bz2 differ: char 11, line 1
++++++ errmsg-mysql-embedded.diff ++++++
--- /var/tmp/diff_new_pack.65bq5W/_old 2010-07-19 20:38:02.000000000 +0200
+++ /var/tmp/diff_new_pack.65bq5W/_new 2010-07-19 20:38:02.000000000 +0200
@@ -1,19 +1,19 @@
---- src/collection/sqlcollection/mysqlecollection/MySqlEmbeddedStorage.cpp 2010-02-03 09:28:08.000000000 +0100
-+++ src/collection/sqlcollection/mysqlecollection/MySqlEmbeddedStorage.cpp 2010-02-03 10:20:47.240107457 +0100
+--- src/core-impl/collections/sqlcollection/mysqlecollection/MySqlEmbeddedStorage.cpp 2010-02-03 09:28:08.000000000 +0100
++++ src/core-impl/collections/sqlcollection/mysqlecollection/MySqlEmbeddedStorage.cpp 2010-02-03 10:20:47.240107457 +0100
@@ -68,7 +68,7 @@
dir.mkpath( "." );
}
-- static const int num_elements = 10;
-+ static const int num_elements = 11;
+- static const int num_elements = 9;
++ static const int num_elements = 10;
char **server_options = new char* [ num_elements + 1 ];
server_options[0] = const_cast( "amarokmysqld" );
server_options[1] = defaultsLine;
-@@ -82,6 +82,7 @@
- server_options[7] = const_cast( "--myisam-recover=FORCE" );
- server_options[8] = const_cast( "--character-set-server=utf8" );
- server_options[9] = const_cast( "--collation-server=utf8_bin" );
-+ server_options[10] = const_cast( "--language=/usr/share/kde4/apps/amarok" );
+@@ -81,6 +81,7 @@
+ server_options[6] = const_cast( "--myisam-recover=FORCE" );
+ server_options[7] = const_cast( "--character-set-server=utf8" );
+ server_options[8] = const_cast( "--collation-server=utf8_bin" );
++ server_options[9] = const_cast( "--language=/usr/share/kde4/apps/amarok" );
server_options[num_elements] = 0;
char **server_groups = new char* [ 3 ];
++++++ errmsg-mysql51-embedded.diff ++++++
--- /var/tmp/diff_new_pack.65bq5W/_old 2010-07-19 20:38:02.000000000 +0200
+++ /var/tmp/diff_new_pack.65bq5W/_new 2010-07-19 20:38:02.000000000 +0200
@@ -1,29 +1,15 @@
---- src/collection/sqlcollection/mysqlecollection/MySqlEmbeddedStorage.cpp 2010-02-03 09:28:08.000000000 +0100
-+++ src/collection/sqlcollection/mysqlecollection/MySqlEmbeddedStorage.cpp 2010-02-03 10:18:01.491257523 +0100
-@@ -68,20 +68,19 @@
- dir.mkpath( "." );
- }
-
-- static const int num_elements = 10;
-+ static const int num_elements = 9;
- char **server_options = new char* [ num_elements + 1 ];
- server_options[0] = const_cast( "amarokmysqld" );
- server_options[1] = defaultsLine;
- server_options[2] = databaseLine;
+--- src/core-impl/collections/sqlcollection/mysqlecollection/MySqlEmbeddedStorage.cpp 2010-02-03 09:28:08.000000000 +0100
++++ src/core-impl/collections/sqlcollection/mysqlecollection/MySqlEmbeddedStorage.cpp 2010-02-03 10:18:01.491257523 +0100
+@@ -76,11 +76,11 @@
// CAUTION: if we ever change the table type we will need to fix a number of MYISAM specific
// functions, such as FULLTEXT indexing.
-- server_options[3] = const_cast( "--default-table-type=MYISAM" );
-- server_options[4] = const_cast( "--default-storage-engine=MYISAM" );
-- server_options[5] = const_cast( "--loose-skip-innodb" );
-- server_options[6] = const_cast( "--skip-grant-tables" );
-- server_options[7] = const_cast( "--myisam-recover=FORCE" );
-- server_options[8] = const_cast( "--character-set-server=utf8" );
-- server_options[9] = const_cast( "--collation-server=utf8_bin" );
-+ server_options[3] = const_cast( "--default-storage-engine=MYISAM" );
-+ server_options[4] = const_cast( "--skip-grant-tables" );
-+ server_options[5] = const_cast( "--myisam-recover=FORCE" );
-+ server_options[6] = const_cast( "--language=/usr/share/kde4/apps/amarok" );
-+ server_options[7] = const_cast( "--character-set-server=utf8" );
+ server_options[3] = const_cast( "--default-storage-engine=MYISAM" );
+- server_options[4] = const_cast( "--loose-skip-innodb" );
++ server_options[4] = const_cast( "--language=/usr/share/kde4/apps/amarok" );
+ server_options[5] = const_cast( "--skip-grant-tables" );
+ server_options[6] = const_cast( "--myisam-recover=FORCE" );
+ server_options[7] = const_cast( "--character-set-server=utf8" );
+- server_options[8] = const_cast( "--collation-server=utf8_bin" );
+ server_options[8] = const_cast( "--collation-server=utf8_unicode_ci" );
server_options[num_elements] = 0;
++++++ initial-preference.diff ++++++
--- /var/tmp/diff_new_pack.65bq5W/_old 2010-07-19 20:38:02.000000000 +0200
+++ /var/tmp/diff_new_pack.65bq5W/_new 2010-07-19 20:38:02.000000000 +0200
@@ -2,11 +2,11 @@
===================================================================
--- src/amarok.desktop.orig
+++ src/amarok.desktop
-@@ -174,9 +174,12 @@ Comment[x-test]=xxAmarok - Rediscover Yo
+@@ -174,9 +174,12 @@
Comment[zh_CN]=Amarok - 重新发现您的音乐!
Comment[zh_TW]=Amarok - 重新探索您的音樂世界!
Icon=amarok
--MimeType=audio/aac;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/x-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;video/x-ms-asf;application/x-ogm-audio;audio/x-vorbis+ogg;application/ogg;audio/ogg;
+-MimeType=audio/aac;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/x-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;video/x-ms-asf;application/x-ogm-audio;audio/x-vorbis+ogg;application/ogg;audio/ogg;x-content/audio-player;x-content/audio-cdda;
+#I am going to let Amarok open audio/mpegurl (application/m3u) since I expect most .m3u files to contain only audio tracks
+#Even less sure about audio/x-scpls (application/pls), but let Amarok open it until someone opens a bug report
+MimeType=audio/aac;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/x-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;
++++++ ksuseinstall.diff ++++++
--- /var/tmp/diff_new_pack.65bq5W/_old 2010-07-19 20:38:02.000000000 +0200
+++ /var/tmp/diff_new_pack.65bq5W/_new 2010-07-19 20:38:02.000000000 +0200
@@ -1,14 +1,13 @@
--- amarok-2.3.0/src/CMakeLists.txt.sav 2010-04-13 18:06:04.002637171 +0200
+++ amarok-2.3.0/src/CMakeLists.txt 2010-04-13 18:06:08.346516580 +0200
-@@ -787,6 +787,7 @@ target_link_libraries(amaroklib
- ${EXTRA_LIBS}
+@@ -798,6 +798,7 @@
amarokpud
+ amarokcore
amarokocsclient
+ ksuseinstall
)
if (KDE_VERSION VERSION_GREATER "4.3.80")
-
--- amarok-2.3.0/src/EngineController.cpp.sav 2010-04-13 18:06:04.001637756 +0200
+++ amarok-2.3.0/src/EngineController.cpp 2010-04-13 18:08:50.959511125 +0200
@@ -54,6 +54,8 @@
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org