Hello community, here is the log from the commit of package kdemultimedia3 checked in at Thu Jun 8 10:27:59 CEST 2006. -------- --- KDE/kdemultimedia3/kdemultimedia3.changes 2006-05-24 13:20:15.000000000 +0200 +++ kdemultimedia3/kdemultimedia3.changes 2006-05-29 13:41:48.000000000 +0200 @@ -1,0 +2,5 @@ +Sat May 20 15:19:58 CEST 2006 - adrian@suse.de + +- do not depend on mp3 packages for the openSUSE build service + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdemultimedia3.spec ++++++ --- /var/tmp/diff_new_pack.oaOlIV/_old 2006-06-08 10:27:05.000000000 +0200 +++ /var/tmp/diff_new_pack.oaOlIV/_new 2006-06-08 10:27:05.000000000 +0200 @@ -11,12 +11,16 @@ # norootforbuild Name: kdemultimedia3 -BuildRequires: cdparanoia flac-devel kdelibs3-devel lame libakode-devel libao-devel libsamplerate-devel libtheora-devel libtunepimp-devel mad-devel mpg321 speex-devel taglib-devel xine-devel xine-lib +BuildRequires: cdparanoia flac-devel kdelibs3-devel libakode-devel libao-devel libmusicbrainz-devel libsamplerate-devel libtheora-devel libtunepimp-devel speex-devel taglib-devel xine-devel xine-lib +%if %{?opensuse_bs:1}0 +%else +BuildRequires: lame mad-devel mpg321 +%endif License: GPL Group: System/GUI/KDE Summary: KDE Multimedia Libraries Version: 3.5.3 -Release: 1 +Release: 3 Url: http://www.kde.org Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -31,7 +35,6 @@ Patch14: disable-cddb-usage-by-default.diff Patch50: juk-kdemm-support.diff Patch51: kdemmbackends-3.4.diff -%define DISTRIBUTABLE 1 Provides: kdemultimedia kmulti %description @@ -310,7 +313,19 @@ make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET kde_post_install install -m 0755 -d $RPM_BUILD_ROOT/opt/kde3/share/config -%if %DISTRIBUTABLE +%if %{?opensuse_bs:1}0 + rm $RPM_BUILD_ROOT/opt/kde3/%_lib/libmpeg* + rm $RPM_BUILD_ROOT/opt/kde3/bin/mpeglibartsplay + rm $RPM_BUILD_ROOT/opt/kde3/%_lib/libarts_mpeglib* + rm $RPM_BUILD_ROOT/opt/kde3/%_lib/libarts_splay.* + rm $RPM_BUILD_ROOT/opt/kde3/%_lib/mcop/MP3PlayObject.mcopclass + rm $RPM_BUILD_ROOT/opt/kde3/%_lib/mcop/CDDAPlayObject.mcopclass + rm $RPM_BUILD_ROOT/opt/kde3/%_lib/mcop/NULLPlayObject.mcopclass + rm $RPM_BUILD_ROOT/opt/kde3/%_lib/mcop/OGGPlayObject.mcopclass + rm $RPM_BUILD_ROOT/opt/kde3/%_lib/mcop/SplayPlayObject.mcopclass + rm $RPM_BUILD_ROOT/opt/kde3/%_lib/mcop/WAVPlayObject.mcopclass +%else + # we need to remove these in any case to avoid mp3 encoding support rm $RPM_BUILD_ROOT/opt/kde3/%_lib/kde3/libkrecexport_mp3.* rm $RPM_BUILD_ROOT/opt/kde3/share/services/krec_exportmp3.desktop %endif @@ -444,11 +459,11 @@ /opt/kde3/%_lib/mcop/akodePlayObject.mcopclass /opt/kde3/%_lib/mcop/akodearts.mcopclass /opt/kde3/%_lib/mcop/akodearts.mcoptype -%if %suse_version > 920 +%if %{?opensuse_bs:1}0 +%else %files mad %defattr(-,root,root) -%endif /opt/kde3/%_lib/libmpeg* %files arts-mad @@ -462,6 +477,7 @@ /opt/kde3/%_lib/mcop/OGGPlayObject.mcopclass /opt/kde3/%_lib/mcop/SplayPlayObject.mcopclass /opt/kde3/%_lib/mcop/WAVPlayObject.mcopclass +%endif %files CD %defattr(-,root,root) @@ -641,6 +657,8 @@ * JuK: Fix "JuK trying to add unknown category in File Renamer" * KAudioCreator: fix regression causing renamed tracks to be disregarded when ripping/encoding +* Sat May 20 2006 - adrian@suse.de +- do not depend on mp3 packages for the openSUSE build service * Mon May 15 2006 - stbinner@suse.de - update to KDE 3.5.2 and 3_5_BRANCH.diff * bugfixes for kscd, juk, kmix and libkcddb ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org