Hello community, here is the log from the commit of package kdemultimedia3 for openSUSE:Factory checked in at 2016-08-12 15:44:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdemultimedia3 (Old) and /work/SRC/openSUSE:Factory/.kdemultimedia3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdemultimedia3" Changes: -------- --- /work/SRC/openSUSE:Factory/kdemultimedia3/kdemultimedia3.changes 2015-03-03 11:16:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdemultimedia3.new/kdemultimedia3.changes 2016-08-12 15:44:14.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Aug 9 09:30:53 UTC 2016 - adr...@suse.de + +- turn opensuse_bs macro into build condition + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdemultimedia3.spec ++++++ --- /var/tmp/diff_new_pack.vM8RY6/_old 2016-08-12 15:44:15.000000000 +0200 +++ /var/tmp/diff_new_pack.vM8RY6/_new 2016-08-12 15:44:15.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package kdemultimedia3 (Version 3.5.10.1) +# spec file for package kdemultimedia3 # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,24 +15,41 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + +%bcond_with mad + Name: kdemultimedia3 # skip-check-libtool-deps -BuildRequires: flac-devel kdelibs3-devel libakode-devel libao-devel libmusicbrainz-devel gstreamer-0_10-devel pkg-config -BuildRequires: libsamplerate-devel libtheora-devel libtunepimp-devel speex-devel taglib-devel libxine-devel xine-ui fdupes -%if 0%{?opensuse_bs} -%else -BuildRequires: lame mad-devel mpg321 +BuildRequires: fdupes +BuildRequires: flac-devel +BuildRequires: gstreamer-0_10-devel +BuildRequires: kdelibs3-devel +BuildRequires: libakode-devel +BuildRequires: libao-devel +BuildRequires: libmusicbrainz-devel +BuildRequires: libsamplerate-devel +BuildRequires: libtheora-devel +BuildRequires: libtunepimp-devel +BuildRequires: libxine-devel +BuildRequires: pkg-config +BuildRequires: speex-devel +BuildRequires: taglib-devel +BuildRequires: xine-ui +%if %{with mad} +BuildRequires: lame +BuildRequires: mad-devel +BuildRequires: mpg321 %endif -BuildRequires: cdparanoia-devel BuildRequires: cdparanoia +BuildRequires: cdparanoia-devel %if %suse_version > 1210 BuildRequires: libavutil-devel %endif +Summary: KDE Multimedia Libraries License: GPL-2.0+ Group: System/GUI/KDE -Summary: KDE Multimedia Libraries Version: 3.5.10.1 -Release: 1 +Release: 0 %define kde_version 3.5.10 Url: http://www.kde.org BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -42,7 +59,6 @@ Source3: %{name}-rpmlintrc Patch0: 3_5_BRANCH.diff Patch2: disable-examples.diff -#Patch3: autorun-kmix.diff Patch9: initial-preferences.diff Patch11: fix-aliasing.diff Patch12: kmix-autostart.diff @@ -53,7 +69,6 @@ Patch51: kdemm.diff.bz2 Patch52: kdemultimedia-gcc43.diff Patch53: akode-config.diff -#Patch54: kdemultimedia-3.5.10-alt3.2-kmix.patch Patch55: kdemultimedia-mmx-test.diff Patch56: kdemultimedia-xine.patch Patch57: kdemultimedia-alsa-capture-fix.diff @@ -64,9 +79,9 @@ information about multimedia files). %package devel -License: GPL-2.0+ Requires: kdemultimedia3 = %{version} kdemultimedia3-sound kdemultimedia3-video kdelibs3-devel Summary: Include Files and Libraries mandatory for Development +License: GPL-2.0+ Group: Development/Libraries/KDE %description devel @@ -74,8 +89,8 @@ to develop applications that require these. %package arts -License: GPL-2.0+ Summary: KDEMM aRts support +License: GPL-2.0+ Group: System/GUI/KDE Provides: kdemultimedia3:/opt/kde3/%_lib/libarts_akode.so @@ -83,16 +98,16 @@ The package contains plugins to support arts via the KDEMM framework. %package arts-mad -License: GPL-2.0+ Summary: MPEG/MP3 support for aRts +License: GPL-2.0+ Group: System/GUI/KDE %description arts-mad Plugin modules for aRts to play mpeg files. %package mad -License: GPL-2.0+ Summary: MP3 support for KDE +License: GPL-2.0+ Group: System/GUI/KDE Requires: mad %ifarch x86_64 s390x ppc64 ia64 @@ -105,9 +120,9 @@ Plugins to support MP3 streams in Arts and KDE via the aKode framework. %package jukebox -License: GPL-2.0+ # usesubdirs juk Summary: KDE Jukebox for MP3 and Ogg Vorbis Files +License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Players # it does not really require it, but juk isn't really usable without Requires: kdemultimedia3-sound @@ -120,13 +135,13 @@ MusicBrainz. %package mixer -License: GPL-2.0+ # usesubdirs kmix Summary: KDE sound mixer +License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Players -Provides: kdemultimedia:/opt/kde2/bin/kmix -Provides: kdemultimedia3:/opt/kde3/bin/kmix Provides: kdemultimedia3-sound:/opt/kde3/bin/kmix +Provides: kdemultimedia3:/opt/kde3/bin/kmix +Provides: kdemultimedia:/opt/kde2/bin/kmix %description mixer This package includes applications for your soundcard: @@ -135,12 +150,12 @@ recording source %package CD -License: GPL-2.0+ # usesubdirs kaudiocreator Summary: KDE Audio CD Tools +License: GPL-2.0+ Group: Productivity/Multimedia/CD/Grabbers -Provides: kdemultimedia3:/opt/kde3/bin/kaudiocreator Provides: kaudiocreator = %{version} +Provides: kdemultimedia3:/opt/kde3/bin/kaudiocreator Obsoletes: kaudiocreator < %{version} %description CD @@ -154,9 +169,9 @@ control center module, also provided by this package. %package sound -License: GPL-2.0+ # usesubdirs mpeglib mpeglib_artsplug audiofile_artsplugin Summary: KDE sound applications and plugins +License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Players Provides: kdemultimedia3:/opt/kde3/bin/yaf-tplay @@ -169,9 +184,9 @@ sound system (MP3, Ogg, Flac) %package midi -License: GPL-2.0+ # usesubdirs kmid Summary: KDE MIDI File Player +License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Midi Provides: kdemultimedia3:/opt/kde3/bin/kmid @@ -180,12 +195,12 @@ %package extra -License: GPL-2.0 # usesubdirs kaboodle krec arts kscd Summary: Additional KDE Sound Applications +License: GPL-2.0 Group: Productivity/Multimedia/Sound/Players -Provides: kdemultimedia:/opt/kde2/bin/kscd Provides: kdemultimedia3:/opt/kde3/bin/kscd +Provides: kdemultimedia:/opt/kde2/bin/kscd Requires: kdemultimedia3-CD %description extra @@ -197,12 +212,13 @@ The KDE CD Player %package video -License: GPL-2.0+ # usesubdirs noatun mpeglib Summary: KDE Video Player +License: GPL-2.0+ Group: Productivity/Multimedia/Video/Players -Provides: kdemultimedia kmulti +Provides: kdemultimedia Provides: kdemultimedia3:/opt/kde3/bin/noatun +Provides: kmulti %description video This package contains the video player Noatun. Noatun is a very modular @@ -210,9 +226,9 @@ package). %package video-xine -License: GPL-2.0+ # usesubdirs xine_artsplugin noatun/modules/simple Summary: Xine plugin for Noatun +License: GPL-2.0+ Group: Productivity/Multimedia/Video/Players %description video-xine @@ -223,7 +239,6 @@ %setup -q -n kdemultimedia-%{kde_version} %patch0 %patch2 -#%patch3 %patch9 %patch11 %patch12 @@ -234,7 +249,6 @@ %patch51 %patch52 %patch53 -#%patch54 -p1 %patch55 -p1 %patch56 -p1 %patch57 -p1 @@ -277,7 +291,11 @@ install -m 0755 -d $RPM_BUILD_ROOT/opt/kde3/share/config mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/icons/hicolor/{16x16,22x22,32x32,48x48,64x64}/apps/ for i in {16,22,32,48,64}; do cp $BUILD_ROOT/opt/kde3/share/icons/crystalsvg/"$i"x"$i"/devices/cdaudio_unmount.png $RPM_BUILD_ROOT/opt/kde3/share/icons/hicolor/"$i"x"$i"/apps/kcmaudiocd.png;done -%if 0%{?opensuse_bs} +%if %{with mad} + # 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 +%else 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* @@ -288,10 +306,6 @@ 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 %ifarch %iZ86 # @@ -422,8 +436,7 @@ /opt/kde3/%_lib/mcop/akodearts.mcoptype /opt/kde3/%_lib/kde3/kdemm_arts.* /opt/kde3/share/services/kdemmbackends/kdemm_arts.desktop -%if 0%{?opensuse_bs} -%else +%if %{with mad} %files mad %defattr(-,root,root)
