Hello community,
here is the log from the commit of package amarok for openSUSE:Factory
checked in at Wed Nov 4 11:50:54 CET 2009.
--------
--- KDE/amarok/amarok.changes 2009-09-13 21:06:12.000000000 +0200
+++ /mounts/work_src_done/STABLE/amarok/amarok.changes 2009-10-25 23:25:03.000000000 +0100
@@ -1,0 +2,75 @@
+Wed Oct 14 17:40:03 UTC 2009 - saigkill@opensuse.org
+
+- Tweaked the Package in -devel
+- fixed some RPMLint Errors
+- added rpmlintrc
+- reworked handle-x-vorbis+ogg.diff (New created with quilt)
+
+-------------------------------------------------------------------
+Fri Oct 9 22:20:37 UTC 2009 - saigkill@opensuse.org
+
+- added handle-x-vorbis+ogg.diff (Based on an Proposal on the amarok-users List.)
+
+-------------------------------------------------------------------
+Wed Sep 30 10:17:02 UTC 2009 - tittiatcoke@gmail.com
+
+- update to 2.2.0 final: several bugfixes and
+ * The MusicBrainz ID of a track is now scrobbled to Last.fm, if it exists
+ (kde#122281)
+ * More collection scanning speedups.
+ * Replay gain works on the Phonon Xine backend.
+ * Fadeout on track end works again.
+ * Fixed regression where the last album to be scanned would not have its
+ cover picked up by the collection scanner.
+ * Sorting by track length in the playlist is now possible (kde#208689)
+ * Fixed track bookmarks not immediately getting removed from progress bar
+ when they are deleted from the bookmark manager.
+ * Fixed new track bookmarks not getting shown in the progress bar
+ immediately.
+ * Fixed track bookmarks not getting correctly repainted when resizing
+ progress bar. (kde#207091)
+ * Correct a logic bug during incremental scanning that could cause the
+ wrong tracks to be removed from the collection, requiring a full rescan.
+ Should fix bug 208403 and likely multiple others. (kde#208403)
+ * "Configure Amarok" dialog takes up less space, making it suitable for
+ small screens.
+ * Fixed photos applet not working after resuming playback. (kde#206829)
+ * Fixed regression where the genre field in the Tag Dialog would show the
+ composer of the track. (kde#208255)
+ * Don't reshuffle the playlist every time the active track changes when
+ * using a random sort order.
+ * Fixed the Various Artist node sometimes being shown in the Collection
+ Browser with nothing underneath it (or an empty "Unknown" album).
+ * Fixed some tracks' tags not being saved correctly to the database.
+ (kde#202021)
+
+-------------------------------------------------------------------
+Tue Sep 22 18:52:02 UTC 2009 - beineri@opensuse.org
+
+- update to 2.2 RC 1: several bugfixes and
+ * Import itpc:// podcast urls
+ * Mark podcast episode as not-new when starting to play it
+ * Reintroduced indicator icons for new podcast episodes
+ * Added "subscribe" command line switch to add a podcast channel
+ * Removed Shoutcast service due to technical & other issues
+ * Made audio CDs respect "Automatically retrieve cover art" setting.
+ * TagLib 1.6 built with ASF & MP4 support is now required. This
+ release fixes many, many bugs and contains new format support.
+ * TagLib-Extras 1.0.0 is now required. This release is compatible
+ with the new TagLib 1.6 release.
+ * Removed non working menu entry "rename" from the Bookmark Manager.
+ Functionality is no longer needed as inline renaming is possible.
+ * Improvements for volume widget in ToolbarNG.
+ * Added "Lock layout" option to the main window's context menu.
+
+-------------------------------------------------------------------
+Tue Sep 15 06:00:25 UTC 2009 - beineri@opensuse.org
+
+- Update to 2.2 Beta 2: several bugfixes and
+ * Added DBus methods Forward and Backward for relative seeking
+ and PlayPause for toggling pause state
+ * Grouping mode has been merged into the playlist layouts so each
+ layout sets its own. The default grouping mode for layout files
+ that do not have this value explicitly set is "Album".
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
amarok-2.1.1-lyricwiki.patch
amarok-2.1.1.tar.bz2
spaces_in_filenames.diff
New:
----
amarok-2.2.0.tar.bz2
amarok-rpmlintrc
cmakelist.diff
handle-x-vorbis+ogg.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ amarok.spec ++++++
--- /var/tmp/diff_new_pack.IihXWy/_old 2009-11-04 11:47:49.000000000 +0100
+++ /var/tmp/diff_new_pack.IihXWy/_new 2009-11-04 11:47:49.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package amarok (Version 2.1.1)
+# spec file for package amarok (Version 2.2.0)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -29,6 +29,7 @@
BuildRequires: libmysqlclient-devel libqca2-devel
BuildRequires: qt4-qtscript taglib-extras-devel
BuildRequires: libgpod-devel >= 0.7.0
+BuildRequires: liblastfm-devel
%if %suse_version > 1110
BuildRequires: libmysqld-devel
%endif
@@ -41,20 +42,23 @@
License: GPL v2 or later
Group: Productivity/Multimedia/Sound/Players
Summary: Media Player for KDE
-Version: 2.1.1
-Release: 6
-Source0: %name-%version.tar.bz2
-Patch3: link-mysql-embedded.diff
-Patch4: errmsg-mysql-embedded.diff
-Patch5: spaces_in_filenames.diff
-Patch6: errmsg-mysql51-embedded.diff
-# PATCH-FIX-UPSTREAM amarok-2.1.1-lyricwiki.patch kde#202366 -- Makes LyricWiki work again. Took from upstream GIT.
-Patch99: amarok-2.1.1-lyricwiki.patch
+Version: 2.2.0
+Release: 1
+Source0: %{name}-2.2.0.tar.bz2
+Source100: %{name}-rpmlintrc
+Patch: cmakelist.diff
+Patch2: link-mysql-embedded.diff
+Patch3: errmsg-mysql-embedded.diff
+Patch4: errmsg-mysql51-embedded.diff
+Patch5: handle-x-vorbis+ogg.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: kde4-amarok = 2.0.90
-Obsoletes: kde4-amarok <= 2.0.90
+Obsoletes: kde4-amarok <= 2.0.89
Requires: qt4-qtscript
-Requires: %{name}-lang = %{version}
+Suggests: amarok-lang
+Requires: taglib >= 1.6
+Requires: libtag-extras1 >= 1.0
+%kde4_runtime_requires
%description
Amarok is a media player for all kinds of media. This includes MP3, Ogg
@@ -70,17 +74,26 @@
Max Howell
Stanislav Karchebny
+%package devel
+License: GPL v2 or later
+Summary: Development Files for %{name}
+Requires: %{name} = %{version}-%{release}
+Group: Development/Languages/C and C++
+
+%description devel
+Amarok build environment development files
+
%lang_package
%prep
-%setup -q -n %name-%version
-%patch3
+%setup -q -n %name-2.2.0
+%patch
+%patch2
+%patch5
%if %suse_version > 1110
-%patch6
-%else
%patch4
+%else
+%patch3
%endif
-%patch5
-%patch99
%build
%ifarch ppc ppc64
@@ -97,6 +110,8 @@
%suse_update_desktop_file -r amarok AudioVideo Player
%find_lang amarok
%find_lang amarokcollectionscanner_qt amarok.lang
+ %find_lang amarok_scriptengine_qscript amarok.lang
+ %find_lang amarokpkg amarok.lang
%kde_post_install
# create hardlinks for duplicate file using fdupes macro
%fdupes %{buildroot}
@@ -116,35 +131,38 @@
%_bindir/amarokcollectionscanner
%_bindir/amarok_afttagger
%_bindir/amarokmp3tunesharmonydaemon
+%_bindir/amarokpkg
%_kde4_modules/amarok_*
%_kde4_modules/kcm_amarok_service_*
-%_kde4_modules/libamarok_*
-%_libdir/libamarok_service_liblastfm.so
-%_libdir/libamaroklib.so
%_libdir/libamaroklib.so.*
-%_libdir/libamarokpud.so
%_libdir/libamarokpud.so.*
-%_libdir/libmediadevicelib.so
-%_libdir/libmediadevicelib.so.*
+%_libdir/libamarokocsclient.so.*
%_libdir/strigi/strigita_audible.so
%_libdir/strigi/strigita_mp4.so
%{_datadir}/applications/kde4/amarok.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
+%{_datadir}/dbus-1/interfaces/org.kde.amarok.Collection.xml
+%{_datadir}/dbus-1/interfaces/org.kde.amarok.SqlCollection.xml
%{_datadir}/icons/hicolor/*/apps/amarok.*
+%_kde_share_dir/apps/solid/actions/amarok-play-audiocd.desktop
%_kde_share_dir/apps/amarok
%_kde_share_dir/apps/desktoptheme/Amarok-Mockup
-%_kde_share_dir/apps/desktoptheme/amarok-default.desktop
%_kde_share_dir/apps/desktoptheme/default/widgets/amarok-*
%_kde_share_dir/config.kcfg/amarokconfig.kcfg
-%_kde_config_dir/amarok.knsrc
+%_kde_config_dir/amarok*
%_kde_share_dir/servicetypes/amarok_*
%_kde_share_dir/services/amarok-*
%_kde_share_dir/services/amarok_*
-%_kde_share_dir/services/amaroklastfm.protocol
%_kde_share_dir/services/amarok.protocol
+%_kde_share_dir/services/amaroklastfm.protocol
%_kde_share_dir/services/ServiceMenus/amarok_append.desktop
-%_kde_config_dir/amarok_homerc
+
+%files devel
+%defattr(-,root,root)
+%{_libdir}/libamaroklib.so
+%{_libdir}/libamarokpud.so
+%{_libdir}/libamarokocsclient.so
%changelog
++++++ amarok-2.1.1.tar.bz2 -> amarok-2.2.0.tar.bz2 ++++++
KDE/amarok/amarok-2.1.1.tar.bz2 /mounts/work_src_done/STABLE/amarok/amarok-2.2.0.tar.bz2 differ: byte 11, line 1
++++++ amarok-rpmlintrc ++++++
# This line is mandatory to access the configuration functions
from Config import *
# amarok
addFilter("unstripped-binary-or-object")
addFilter("shared-lib-calls-exit")
addFilter("shlib-policy-missing-suffix")
++++++ cmakelist.diff ++++++
--- cmake/modules/FindQtScriptQtBindings.cmake
+++ cmake/modules/FindQtScriptQtBindings.cmake
@@ -28,6 +28,7 @@
message( STATUS "includes ${CMAKE_REQUIRED_INCLUDES} libraries ${CMAKE_REQUIRED_LIBRARIES}" )
CHECK_CXX_SOURCE_RUNS( "${source}" BINDINGS_RUN_RESULT)
+ set(BINDINGS_RUN_RESULT 1)
if(BINDINGS_RUN_RESULT EQUAL 1)
message( STATUS "QtBindings found")
set(QTSCRIPTQTBINDINGS_FOUND TRUE)
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -55,6 +55,7 @@
macro_log_feature( KDE4_FOUND "kdelibs" "The toolkit Amarok uses to build" "http://www.kde.org" TRUE "4.2.0" "" )
find_package( QtScriptQtBindings REQUIRED )
+ set(QTSCRIPTQTBINDINGS_FOUND TRUE)
macro_log_feature( QTSCRIPTQTBINDINGS_FOUND "qtscript-qt" "QtScript Qt Bindings" "http://code.google.com/p/qtscriptgenerator/" TRUE "" "" )
add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
++++++ errmsg-mysql51-embedded.diff ++++++
--- /var/tmp/diff_new_pack.IihXWy/_old 2009-11-04 11:47:49.000000000 +0100
+++ /var/tmp/diff_new_pack.IihXWy/_new 2009-11-04 11:47:49.000000000 +0100
@@ -1,11 +1,11 @@
---- src/collection/sqlcollection/MySqlEmbeddedCollection.cpp 2009/01/06 18:00:57 1.1
-+++ src/collection/sqlcollection/MySqlEmbeddedCollection.cpp 2009/01/06 18:02:52
-@@ -109,18 +109,17 @@
+--- src/collection/mysqlecollection/MySqlEmbeddedCollection.cpp
++++ src/collection/mysqlecollection/MySqlEmbeddedCollection.cpp
+@@ -64,20 +64,19 @@
dir.mkpath( "." );
}
-- static const int num_elements = 8;
-+ static const int num_elements = 7;
+- 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;
@@ -17,10 +17,14 @@
- 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_unicode_ci" );
+ 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[8] = const_cast( "--collation-server=utf8_unicode_ci" );
server_options[num_elements] = 0;
char **server_groups = new char* [ 3 ];
++++++ errmsg-mysql-embedded.diff ++++++
--- /var/tmp/diff_new_pack.IihXWy/_old 2009-11-04 11:47:49.000000000 +0100
+++ /var/tmp/diff_new_pack.IihXWy/_new 2009-11-04 11:47:49.000000000 +0100
@@ -1,19 +1,19 @@
---- src/collection/sqlcollection/MySqlEmbeddedCollection.cpp 2009/01/06 18:00:57 1.1
-+++ src/collection/sqlcollection/MySqlEmbeddedCollection.cpp 2009/01/06 18:02:52
-@@ -109,7 +109,7 @@
+--- src/collection/mysqlecollection/MySqlEmbeddedCollection.cpp
++++ src/collection/mysqlecollection/MySqlEmbeddedCollection.cpp
+@@ -64,7 +64,7 @@
dir.mkpath( "." );
}
-- static const int num_elements = 8;
-+ static const int num_elements = 9;
+- static const int num_elements = 10;
++ static const int num_elements = 11;
char **server_options = new char* [ num_elements + 1 ];
server_options[0] = const_cast( "amarokmysqld" );
server_options[1] = defaultsLine;
-@@ -121,6 +121,7 @@
- server_options[5] = const_cast( "--loose-skip-innodb" );
- server_options[6] = const_cast( "--skip-grant-tables" );
+@@ -78,6 +78,7 @@
server_options[7] = const_cast( "--myisam-recover=FORCE" );
-+ server_options[8] = const_cast( "--language=/usr/share/kde4/apps/amarok" );
+ server_options[8] = const_cast( "--character-set-server=utf8" );
+ server_options[9] = const_cast( "--collation-server=utf8_unicode_ci" );
++ server_options[10] = const_cast( "--language=/usr/share/kde4/apps/amarok" );
server_options[num_elements] = 0;
char **server_groups = new char* [ 3 ];
++++++ handle-x-vorbis+ogg.diff ++++++
Index: src/collection/umscollection/handler/UmsHandler.cpp
===================================================================
--- src/collection/umscollection/handler/UmsHandler.cpp.orig
+++ src/collection/umscollection/handler/UmsHandler.cpp
@@ -141,7 +141,7 @@ UmsHandler::init()
*/
m_mimetypes << "audio/mpeg" << "audio/x-wav" << "video/x-ms-asf" << "audio/flac"
<< "audio/x-ms-wma" << "application/x-ogg" << "audio/x-aac" << "audio/mp4a-latm"
- << "video/mp4" << "audio/ac3";
+ << "video/mp4" << "audio/ac3" << "audio/x-vorbis+ogg" ;
m_timer.setSingleShot( true );
++++++ link-mysql-embedded.diff ++++++
--- /var/tmp/diff_new_pack.IihXWy/_old 2009-11-04 11:47:49.000000000 +0100
+++ /var/tmp/diff_new_pack.IihXWy/_new 2009-11-04 11:47:49.000000000 +0100
@@ -1,14 +1,10 @@
---- src/collection/sqlcollection/CMakeLists.txt 2009/06/04 07:37:33 1.1
-+++ src/collection/sqlcollection/CMakeLists.txt 2009/06/04 07:37:59
-@@ -63,11 +63,6 @@
+--- src/collection/mysqlecollection/CMakeLists.txt
++++ src/collection/mysqlecollection/CMakeLists.txt
+@@ -64,7 +64,6 @@
${KDE4_KIO_LIBS}
${KDE4_THREADWEAVER_LIBRARIES}
${MYSQL_EMBEDDED_LIBRARIES}
-- #this line may be needed on Debian or other systems where mysql is compiled
-- #in the prescence of yassl. However it seems to cause problems for other people,
-- #so its been disabled.
-- #See http://bugs.mysql.com/bug.php?id=21489
- ${MYSQL_LIBRARIES}
${CMAKE_DL_LIBS}
${ZLIB_LIBRARIES}
- )
+ ${TAGLIB_LIBRARIES}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org