RPM Packaging: update tdemultimedia

1 files changed, 33 insertions, 26 deletions

diff --git a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
index 431def1e9..fc1a1faad 100644
--- a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
+++ b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
@@ -231,7 +231,7 @@ Requires: trinity-libarts-audiofile = %{version}-%{release}
 %{?with_mpeg:Requires: trinity-libarts-mpeglib = %{version}-%{release}}
 %{?with_xine:Requires: trinity-libarts-xine = %{version}-%{release}}
 Requires: trinity-libkcddb = %{version}-%{release}
-Requires: trinity-mpeglib = %{version}-%{release}
+%{?with_mpeg:Requires: trinity-mpeglib = %{version}-%{release}}
 Requires: trinity-noatun = %{version}-%{release}
 
 
@@ -437,7 +437,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-juk
 Summary:	Music organizer and player for Trinity
-Group:		Applications/Multimedia
+Group:		Productivity/Multimedia/Sound/Players
 
 %description -n trinity-juk
 JuK (pronounced "jook") is a jukebox and music manager for the TDE
@@ -485,7 +485,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kaboodle
 Summary:	Light, embedded media player for Trinity
-Group:		Applications/Multimedia
+Group:		System/GUI/Other
 
 %if 0%{?with_xine}
 Requires:	trinity-libarts-xine = %{version}-%{release}
@@ -525,7 +525,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kaudiocreator
 Summary:	CD ripper and audio encoder frontend for Trinity
-Group:		Applications/Multimedia
+Group:		System/GUI/Other
 
 Requires:	%{name}-tdeio-plugins = %{version}-%{release}
 Requires:	vorbis-tools
@@ -569,7 +569,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package kfile-plugins
 Summary:	An au/avi/m3u/mp3/ogg/wav plugins for kfile
-Group:		Applications/Multimedia
+Group:		System/GUI/Other
 
 %description kfile-plugins
 au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity.
@@ -614,7 +614,7 @@ au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity.
 
 %package kappfinder-data
 Summary:	Multimedia data for kappfinder
-Group:		Applications/Multimedia
+Group:		System/GUI/Other
 
 Requires: 	trinity-kappfinder >= %{tde_version}
 Requires:	trinity-tdebase-runtime-data-common >= %{tde_version}
@@ -632,7 +632,7 @@ This package provides data on multimedia applications for kappfinder.
 
 %package tdeio-plugins
 Summary:	Enables the browsing of audio CDs under Konqueror
-Group:		Applications/Multimedia
+Group:		System/GUI/Other
 Requires:	trinity-tdebase-tdeio-plugins >= %{tde_version}
 
 Obsoletes:	trinity-tdemultimedia-kio-plugins < %{version}-%{release}
@@ -679,7 +679,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-tdemid
 Summary:	MIDI/karaoke player for Trinity
-Group:		Applications/Multimedia
+Group:		System/GUI/Other
 
 Obsoletes:	trinity-kmid < %{version}-%{release}
 Provides:	trinity-kmid = %{version}-%{release}
@@ -720,7 +720,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kmix
 Summary:	Sound mixer applet for Trinity
-Group:		Applications/Multimedia
+Group:		System/GUI/Other
 Requires:	trinity-kicker >= %{tde_version}
 
 %description -n trinity-kmix
@@ -767,7 +767,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-krec
 Summary:	Sound recorder utility for Trinity
-Group:		Applications/Multimedia
+Group:		System/GUI/Other
 
 %description -n trinity-krec
 This is a sound recording utility for Trinity.
@@ -821,7 +821,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package -n trinity-kscd
 Summary:	Audio CD player for Trinity
-Group:		Applications/Multimedia
+Group:		System/GUI/Other
 
 %description -n trinity-kscd
 This is Trinity's audio CD player.
@@ -858,7 +858,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 %if 0%{?with_akode}
 %package -n trinity-libarts-akode
 Summary:	Akode plugin for aRts
-Group:		Environment/Libraries
+Group:		System/GUI/Other
 
 %description -n trinity-libarts-akode
 This package contains akode plugins for aRts.
@@ -889,7 +889,7 @@ This package contains akode plugins for aRts.
 
 %package -n trinity-libarts-audiofile
 Summary:	Audiofile plugin for aRts
-Group:		Environment/Libraries
+Group:		System/GUI/Other
 
 %description -n trinity-libarts-audiofile
 This package contains audiofile plugins for aRts.
@@ -913,7 +913,7 @@ This package contains audiofile plugins for aRts.
 %if 0%{?with_mpeg}
 %package -n trinity-libarts-mpeglib
 Summary:	Mpeglib plugin for aRts, supporting mp3 and mpeg audio/video
-Group:		Environment/Libraries
+Group:		System/GUI/Other
 
 %description -n trinity-libarts-mpeglib
 This package contains the mpeglib aRts plugin, supporting mp3 and mpeg
@@ -947,7 +947,7 @@ This is the arts (TDE Sound daemon) plugin.
 %if 0%{?with_xine}
 %package -n trinity-libarts-xine
 Summary:	ARTS plugin enabling xine support
-Group:		Environment/Libraries
+Group:		System/GUI/Other
 
 %description -n trinity-libarts-xine
 This package contains aRts' xine plugin, allowing the use of the xine
@@ -977,7 +977,7 @@ multimedia engine though aRts.
 
 %package -n trinity-libkcddb
 Summary:	CDDB library for Trinity
-Group:		Environment/Libraries
+Group:		System/GUI/Other
 Requires:	trinity-kcontrol >= %{tde_version}
 
 %description -n trinity-libkcddb
@@ -1005,9 +1005,11 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
+%if 0%{?with_mpeg}
+
 %package -n trinity-mpeglib
 Summary:	MP3 and MPEG-1 audio and video library
-Group:		Environment/Libraries
+Group:		System/GUI/Other
 %if 0%{?with_mpeg}
 Requires:	trinity-libarts-mpeglib = %{version}-%{release}
 %endif
@@ -1025,9 +1027,7 @@ and WAV playback
 %{tde_bindir}/yaf-tplay
 %{tde_bindir}/yaf-vorbis
 %{tde_bindir}/yaf-yuv
-%if 0%{?with_mpeg}
 %{tde_libdir}/libmpeg-0.3.0.so
-%endif
 %{tde_libdir}/libyafcore.so
 %{tde_libdir}/libyafxplayer.so
 
@@ -1037,11 +1037,13 @@ and WAV playback
 %postun -n trinity-mpeglib
 /sbin/ldconfig
 
+%endif
+
 ##########
 
 %package -n trinity-noatun
 Summary:	Media player for Trinity
-Group:		Applications/Multimedia
+Group:		System/GUI/Other
 Requires:	trinity-tdebase-bin >= %{tde_version}
 
 # 20120802: Hack to avoid dependency issue on MGA2 and MDV2011
@@ -1142,7 +1144,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package devel
 Summary:	Development files for %{name}, aRts and noatun plugins
-Group:		Development/Libraries
+Group:		Development/Libraries/Other
 Requires:	%{name} = %{version}-%{release}
 Requires:	trinity-tdelibs-devel >= %{tde_version}
 
@@ -1255,16 +1257,19 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
   \
   --with-extra-includes="%{_includedir}/cdda:%{_includedir}/cddb:%{tde_includedir}/artsc:%{tde_tdeincludedir}/arts" \
   \
-  --with-cdparanoia \
-  --with-flac \
-  --with-theora \
   --with-vorbis \
+  --without-ossaudio \
   --with-alsa \
-  --with-gstreamer \
+  --with-cdparanoia \
   %{?with_lame:--with-lame} %{!?with_lame:--without-lame} \
+  %{?with_taglib:--with-taglib} %{!?with_taglib:--without-taglib} \
   %{?with_akode:--with-akode} %{!?with_akode:--without-akode} \
+  --with-audiofile \
   %{?with_musicbrainz:--with-musicbrainz} %{!?with_musicbrainz:--without-musicbrainz} \
-  %{?with_taglib:--with-taglib} %{!?with_taglib:--without-taglib} \
+  --with-gstreamer \
+  --with-kscd-cdda \
+  --with-theora \
+  --with-flac \
   %{?with_xine:--with-xine} %{!?with_xine:--without-xine}
 
 %__make %{?_smp_mflags} || %__make
@@ -1278,9 +1283,11 @@ export PATH="%{tde_bindir}:${PATH}"
 # Disable MPEG support entirely
 %if 0%{?with_mpeg} == 0
   %__rm %{?buildroot}%{tde_bindir}/mpeglibartsplay
+  %__rm %{?buildroot}%{tde_bindir}/yaf-*
   %__rm %{?buildroot}%{tde_libdir}/libarts_mpeglib*
   %__rm %{?buildroot}%{tde_libdir}/libarts_splay.*
   %__rm %{?buildroot}%{tde_libdir}/libmpeg*
+  %__rm %{?buildroot}%{tde_libdir}/libyaf*
   %__rm %{?buildroot}%{tde_libdir}/mcop/MP3PlayObject.mcopclass
   %__rm %{?buildroot}%{tde_libdir}/mcop/CDDAPlayObject.mcopclass
   %__rm %{?buildroot}%{tde_libdir}/mcop/NULLPlayObject.mcopclass