Hello community,
here is the log from the commit of package amarok for openSUSE:Factory
checked in at Fri Sep 24 09:36:20 CEST 2010.
--------
--- KDE/amarok/amarok.changes 2010-08-25 15:45:45.000000000 +0200
+++ /mounts/work_src_done/STABLE/amarok/amarok.changes 2010-09-24 09:28:17.000000000 +0200
@@ -1,0 +2,9 @@
+Fri Sep 24 07:27:59 UTC 2010 - coolo@novell.com
+
+- update to 2.3.2
+ * Bumped libMTP dependency to version 1.0.0.
+ * Improved response of current track and albums applet on data updates.
+ * Use system date/time format for default name when saving user playlists.
+ * Many bug fixes
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
amarok-2.3.1.tar.bz2
fix_define_mismatch.diff
New:
----
amarok-2.3.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ amarok.spec ++++++
--- /var/tmp/diff_new_pack.trbs2j/_old 2010-09-24 09:36:10.000000000 +0200
+++ /var/tmp/diff_new_pack.trbs2j/_new 2010-09-24 09:36:10.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package amarok (Version 2.3.1)
+# spec file for package amarok (Version 2.3.2)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -26,7 +26,7 @@
BuildRequires: dbus-1-glib-devel libogg-devel libsamplerate-devel libsndfile-devel
BuildRequires: libcurl-devel libsoprano-devel loudmouth-devel
BuildRequires: libmysqlclient-devel libqca2-devel
-BuildRequires: qt4-qtscript taglib-extras-devel
+BuildRequires: qt4-qtscript taglib-extras-devel tcpd-devel
BuildRequires: libgpod-devel >= 0.7.0
%if %suse_version > 1120 || !0%{?kde_updatedapps}
BuildRequires: liblastfm-devel
@@ -41,8 +41,8 @@
License: GPLv2+
Group: Productivity/Multimedia/Sound/Players
Summary: Media Player for KDE
-Version: 2.3.1
-Release: 3
+Version: 2.3.2
+Release: 1
Source0: %{name}-%{version}.tar.bz2
Source100: %{name}-rpmlintrc
Patch3: errmsg-mysql-embedded.diff
@@ -51,7 +51,6 @@
Patch5: no_buildtime.patch
Patch7: ksuseinstall.diff
Patch8: initial-preference.diff
-Patch9: fix_define_mismatch.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: kde4-amarok = 2.0.90
Obsoletes: kde4-amarok <= 2.0.89
@@ -97,7 +96,6 @@
%patch7 -p1
%endif
%patch8
-%patch9 -p1
%build
%ifarch ppc ppc64
@@ -149,7 +147,7 @@
%_libdir/strigi/strigita_audible.so
%_libdir/strigi/strigita_mp4.so
%{_datadir}/applications/kde4/amarok.desktop
-%{_datadir}/applications/kde4/amarokNoAudio.desktop
+%{_datadir}/applications/kde4/amarok_containers.desktop
%{_datadir}/dbus-1/interfaces/org.freedesktop.MediaPlayer.player.xml
%{_datadir}/dbus-1/interfaces/org.freedesktop.MediaPlayer.root.xml
%{_datadir}/dbus-1/interfaces/org.freedesktop.MediaPlayer.tracklist.xml
++++++ amarok-2.3.1.tar.bz2 -> amarok-2.3.2.tar.bz2 ++++++
KDE/amarok/amarok-2.3.1.tar.bz2 /mounts/work_src_done/STABLE/amarok/amarok-2.3.2.tar.bz2 differ: char 11, line 1
++++++ errmsg-mysql51-embedded.diff ++++++
--- /var/tmp/diff_new_pack.trbs2j/_old 2010-09-24 09:36:10.000000000 +0200
+++ /var/tmp/diff_new_pack.trbs2j/_new 2010-09-24 09:36:10.000000000 +0200
@@ -1,16 +1,18 @@
---- 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-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;
-
- char **server_groups = new char* [ 3 ];
+Index: src/core-impl/collections/sqlcollection/mysqlecollection/MySqlEmbeddedStorage.cpp
+===================================================================
+--- src/core-impl/collections/sqlcollection/mysqlecollection/MySqlEmbeddedStorage.cpp.orig
++++ src/core-impl/collections/sqlcollection/mysqlecollection/MySqlEmbeddedStorage.cpp
+@@ -63,11 +63,11 @@ MySqlEmbeddedStorage::MySqlEmbeddedStora
+ // CAUTION: if we ever change the table type we will need to fix a number of MYISAM specific
+ // functions, such as FULLTEXT indexing.
+ out << "default-storage-engine = MyISAM" << endl;
+- out << "loose-innodb = 0" << endl;
++ out << "language = /usr/share/kde4/apps/amarok" << endl;
+ out << "skip-grant-tables = 1" << endl;
+ out << "myisam-recover = FORCE" << endl;
+ out << "character-set-server = utf8" << endl;
+- out << "collation-server = utf8_bin" << endl;
++ out << "collation-server = utf8_unicode_ci" << endl;
+ //If the file is world-writable MySQL won't even read it
+ df.setPermissions( QFile::ReadOwner | QFile::WriteOwner | QFile::ReadGroup | QFile::ReadOther );
+ df.close();
++++++ initial-preference.diff ++++++
--- /var/tmp/diff_new_pack.trbs2j/_old 2010-09-24 09:36:10.000000000 +0200
+++ /var/tmp/diff_new_pack.trbs2j/_new 2010-09-24 09:36:10.000000000 +0200
@@ -2,14 +2,7 @@
===================================================================
--- src/amarok.desktop.orig
+++ src/amarok.desktop
-@@ -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;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;
+@@ -180,5 +180,6 @@ MimeType=audio/aac;audio/mp4;audio/mpeg;
X-DocPath=amarok/index.html
X-KDE-Keywords=music,podcast
X-KDE-Protocols=http
@@ -204,15 +197,3 @@
+X-KDE-Protocols=http
+Terminal=false
+Categories=Qt;KDE;AudioVideo;Audio;Player;
-Index: src/CMakeLists.txt
-===================================================================
---- src/CMakeLists.txt.orig
-+++ src/CMakeLists.txt
-@@ -857,6 +857,7 @@ endif(Q_WS_MAC)
- ########### install files ###############
-
- install(FILES amarok.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-+install(FILES amarokNoAudio.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
- install(FILES amarok_plugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
- install(FILES amarok_codecinstall.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
- install(FILES amarok_append.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ServiceMenus)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org