Hello community, here is the log from the commit of package amarok checked in at Tue Dec 2 15:12:37 CET 2008. -------- --- KDE/amarok/amarok.changes 2008-08-17 18:04:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/amarok/amarok.changes 2008-12-02 00:41:24.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 2 00:41:02 CET 2008 - dmueller@suse.de + +- fix fileconflicts with kde4-amarok by reverting bnc#392795 fix + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amarok.spec ++++++ --- /var/tmp/diff_new_pack.R18918/_old 2008-12-02 15:08:25.000000000 +0100 +++ /var/tmp/diff_new_pack.R18918/_new 2008-12-02 15:08:25.000000000 +0100 @@ -41,7 +41,7 @@ Group: Productivity/Multimedia/Sound/Players Summary: Media Player for KDE Version: 1.4.10 -Release: 1 +Release: 26 Requires: kdelibs3 >= %(rpm -q --queryformat '%{VERSION}' kdelibs3) Requires: amarok_engine >= %version Requires: ruby @@ -209,8 +209,10 @@ cp %{S:1} $RPM_BUILD_ROOT/opt/kde3/share/services cp %{S:2} $RPM_BUILD_ROOT/opt/kde3/share/services %endif +%if %suse_version < 1110 mkdir -p $RPM_BUILD_ROOT/usr/share/kde4/services/ cp $RPM_BUILD_ROOT/opt/kde3/share/services/amarok*.protocol $RPM_BUILD_ROOT/usr/share/kde4/services/ +%endif %clean rm -rf $RPM_BUILD_ROOT @@ -263,9 +265,11 @@ /opt/kde3/share/services/amarokitpc.protocol /opt/kde3/share/services/amaroklastfm.protocol /opt/kde3/share/services/amarokpcast.protocol +%if %suse_version < 1110 %dir /usr/share/kde4 %dir /usr/share/kde4/services /usr/share/kde4/services/* +%endif /opt/kde3/share/servicetypes/amarok_codecinstall.desktop /opt/kde3/share/apps/konqsidebartng/* %if %suse_version > 1000 @@ -318,6 +322,8 @@ %endif %changelog +* Tue Dec 02 2008 dmueller@suse.de +- fix fileconflicts with kde4-amarok by reverting bnc#392795 fix * Sun Aug 17 2008 stbinner@suse.de - update to 1.4.10: fix tmp file vulnerability in the Magnatune database parsing. Secunia#SA31418 / CVE-2008-3699 / bnc#417232 @@ -327,7 +333,7 @@ - install copy of .protocol files for KDE4 (same as bnc#392795) * Fri Apr 18 2008 dmueller@suse.de - fix yauap engine name (bnc#381082) -* Sat Apr 12 2008 dmueller@suse.de +* Fri Apr 11 2008 dmueller@suse.de - update to 1.4.9.1: * translation update * The last.fm dialog did not always properly disable options when the @@ -356,7 +362,7 @@ - amarok-yauap should provide amarok_engine (#328875) - rewrite yauap dbus bindings to be more robust (#327086) - add patches for threading races (#115612) -* Tue Sep 18 2007 dmueller@suse.de +* Mon Sep 17 2007 dmueller@suse.de - fix collection scanner zombie (#309055) - rename yauap to gstreamer/yauap (#308123) * Thu Aug 30 2007 ssommer@suse.de @@ -499,7 +505,7 @@ - only give amarok http urls, it has no KIO support (#174512) * Wed Aug 23 2006 stbinner@suse.de - enable MTP support for Factory -* Tue Aug 22 2006 stbinner@suse.de +* Mon Aug 21 2006 stbinner@suse.de - update to version 1.4.2 * Handle itpc:// and pcast:// urls for adding podcast feeds * Synchronize playlists to media devices. @@ -1024,7 +1030,7 @@ - add gstreamer10 engine from 1.4beta2 * Fri Mar 17 2006 dmueller@suse.de - really fix memory leak in xine backend -* Thu Mar 16 2006 dmueller@suse.de +* Wed Mar 15 2006 dmueller@suse.de - fix memory leak in xine backend * Mon Mar 13 2006 dmueller@suse.de - fix default path for helix libs (#157398) @@ -1067,7 +1073,7 @@ - add 1.3 BRANCH diff (#129296, #129226) * Thu Oct 13 2005 stbinner@suse.de - remove extra qualification for gcc 4.1 compilation -* Tue Oct 11 2005 stbinner@suse.de +* Mon Oct 10 2005 stbinner@suse.de - update to 1.3.3 * Sat Oct 08 2005 dmueller@suse.de - add patch which reduces memory usage by 50%% and @@ -1228,13 +1234,13 @@ stream. amarok can only handle remote ports in 1.0 (#46568) * Wed Sep 29 2004 adrian@suse.de - add audio/mpegurl as mimetype for .m3u files -* Mon Sep 27 2004 adrian@suse.de +* Sun Sep 26 2004 adrian@suse.de - update to version 1.1 TODO: use external sqlite 3.x and enable libvisual * Sat Sep 25 2004 adrian@suse.de - call XInitThreads() on startup, otherwise xine plugin might cause a hang -* Sat Sep 25 2004 adrian@suse.de +* Fri Sep 24 2004 adrian@suse.de - fix streaming via http (default port 0 is not a good idea #46102) * Fri Sep 17 2004 adrian@suse.de - add InitialPreference=7 to desktop file @@ -1256,12 +1262,12 @@ - update to version 1.0 final * Wed Jun 02 2004 adrian@suse.de - add modplug_artsplugin version 0.5 -* Wed Jun 02 2004 adrian@suse.de +* Tue Jun 01 2004 adrian@suse.de - update to version 1.0 beta 4 - update translations -* Wed May 12 2004 adrian@suse.de -- add translations * Tue May 11 2004 adrian@suse.de +- add translations +* Mon May 10 2004 adrian@suse.de - add missing %%defattr * Mon May 10 2004 adrian@suse.de - update to version 1.0 beta 3 @@ -1280,7 +1286,7 @@ - update to beta3 * Mon Feb 23 2004 adrian@suse.de - move menu entry to Audio Players -* Sun Feb 22 2004 adrian@suse.de +* Sat Feb 21 2004 adrian@suse.de - neededforbuild fix kdemultimedia3-video -> -sound - disable GStreamer support again (direct crash when using it) * Sat Feb 21 2004 adrian@suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org