Hello community, here is the log from the commit of package kaffeine checked in at Thu Aug 17 18:15:09 CEST 2006. -------- --- KDE/kaffeine/kaffeine.changes 2006-07-21 19:25:22.000000000 +0200 +++ kaffeine/kaffeine.changes 2006-08-17 11:28:31.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Aug 17 11:28:15 CEST 2006 - stbinner@suse.de + +- fix x-mplayer2.desktop file conflict with kdelibs3 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kaffeine.spec ++++++ --- /var/tmp/diff_new_pack.wVTtUS/_old 2006-08-17 18:15:00.000000000 +0200 +++ /var/tmp/diff_new_pack.wVTtUS/_new 2006-08-17 18:15:00.000000000 +0200 @@ -22,7 +22,7 @@ Group: Productivity/Multimedia/Video/Players Summary: Xine-Based Multimedia Player Version: 0.8.1 -Release: 7 +Release: 8 %define rversion %version BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) @@ -101,6 +101,7 @@ # -r to get rid of Music %suse_update_desktop_file -r kaffeine KDE AudioVideo Player Video rm -rf $RPM_BUILD_ROOT/opt/kde3/share/locale/xx +rm $RPM_BUILD_ROOT/opt/kde3/share/mimelnk/application/x-mplayer2.desktop %find_lang %name-%version %post @@ -138,6 +139,8 @@ /opt/kde3/share/services/gstreamer_part.desktop %changelog -n kaffeine +* Thu Aug 17 2006 - stbinner@suse.de +- fix x-mplayer2.desktop file conflict with kdelibs3 * Fri Jul 21 2006 - schwab@suse.de - Quote '&' in subtitle names in playlist [KDE#131180]. * Sun Jun 04 2006 - coolo@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
participants (1)
-
root@suse.de