1 files changed, 51 insertions, 31 deletions

diff --git a/redhat/applications/kaffeine/kaffeine-14.0.0.spec b/redhat/applications/kaffeine/kaffeine-14.0.0.spec
index 37b4ce428..813e15203 100644
--- a/redhat/applications/kaffeine/kaffeine-14.0.0.spec
+++ b/redhat/applications/kaffeine/kaffeine-14.0.0.spec
@@ -36,75 +36,92 @@ Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
 BuildRequires:	gettext
+
+# VORBIS support
 BuildRequires:	libvorbis-devel
-BuildRequires:	libcdio-devel
 
+# CDDA support
+BuildRequires:	libcdio-devel
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	libcdda-devel
-BuildRequires:	%{_lib}xext%{?mgaversion:6}-devel
-BuildRequires:	%{_lib}xtst%{?mgaversion:6}-devel
-BuildRequires:	%{_lib}xinerama%{?mgaversion:1}-devel
-# dvb
-%if 0%{?pclinuxos} == 0
-BuildRequires:	kernel-headers
 %endif
-BuildRequires:	libgstreamer-devel >= 0.10
-BuildRequires:	libgstreamer-plugins-base-devel >= 0.10
-%else
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
 BuildRequires:	cdparanoia
 BuildRequires:	cdparanoia-devel
+%endif
 %if 0%{?suse_version} >= 1220
 BuildRequires:	libcdio-paranoia-devel
 %endif
 
 # X11 stuff
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}xext%{?mgaversion:6}-devel
+BuildRequires:	%{_lib}xtst%{?mgaversion:6}-devel
+BuildRequires:	%{_lib}xinerama%{?mgaversion:1}-devel
+%endif
 %if 0%{?rhel} == 4
 BuildRequires:	xorg-x11-devel 
-%else
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
 BuildRequires:	libXext-devel 
 BuildRequires:	libXtst-devel
 BuildRequires:	libXinerama-devel
 %endif
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
+BuildRequires: libxcb-devel
 %endif
 
-# dvb
-BuildRequires:	gstreamer-devel
+# GSTREAMER support
+%if 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gstreamer 1
 %if 0%{?suse_version}
+BuildRequires:	gstreamer-devel
 BuildRequires:	gstreamer-0_10-plugins-base-devel
 %endif
 %if 0%{?rhel} == 4
 BuildRequires:	gstreamer-devel
 BuildRequires:	gstreamer-plugins-devel
 %endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?rhel} >= 5 || 0%{?fedora}
 BuildRequires:	gstreamer-plugins-base-devel >= 0.10
-BuildRequires:	glibc-kernheaders 
 %endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	libgstreamer-devel >= 0.10
+BuildRequires:	libgstreamer-plugins-base-devel >= 0.10
 %endif
-
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
-BuildRequires:	libxcb-devel
 %endif
 
-# xine-lib
+# XINE support
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-BuildRequires:	libxine-devel
+BuildRequires:  libxine-devel
 %endif
 %if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	xine-lib-devel
+BuildRequires:  xine-lib-devel
 %endif
 
-# LAME
+# LAME support
 %if 0%{?suse_version}
 BuildRequires:	libmp3lame-devel
 %else
 BuildRequires:	lame-devel
 %endif
 
-Requires:		%{name}-libs = %{version}-%{release}
+# WTF support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	kernel-headers
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora}
+BuildRequires:	glibc-kernheaders 
+%endif
+
+Requires: %{name}-libs = %{version}-%{release}
 
 %description
 Kaffeine is a xine-based media player for TDE.  It plays back CDs,
@@ -121,7 +138,9 @@ Konqueror plugin, OSD and much more.
 %{tde_libdir}/libkaffeinepart.so
 %{tde_tdelibdir}/lib*.*
 %{tde_datadir}/appl*/*/*.desktop
+%if 0%{?with_gstreamer}
 %{tde_datadir}/apps/gstreamerpart/
+%endif
 %{tde_datadir}/apps/kaffeine/
 %{tde_datadir}/apps/konqueror/servicemenus/*.desktop
 %{tde_datadir}/apps/profiles/
@@ -206,7 +225,6 @@ Requires:		%{name} = %{version}-%{release}
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-export TDEDIR=%{tde_prefix}
 
 %configure \
   --prefix=%{tde_prefix} \
@@ -216,15 +234,18 @@ export TDEDIR=%{tde_prefix}
   --datadir=%{tde_datadir} \
   --includedir=%{tde_tdeincludedir} \
   --mandir=%{tde_mandir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
   --enable-new-ldflags \
-  --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final \
-  --disable-rpath \
+  --enable-final \
+  --enable-closure \
+  --enable-rpath \
+  --disable-gcc-hidden-visibility \
+  \
   --with-xinerama \
   --with-gstreamer \
   --with-lame \
-  --with-extra-libs=%{_prefix}/%{_lib} \
-  --enable-closure \
 %if 0%{?rhel} > 0 && 0%{?rhel} <= 5
   --without-dvb \
 %endif
@@ -250,7 +271,6 @@ rm -f $RPM_BUILD_ROOT%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
 rm -rf $RPM_BUILD_ROOT
 
 
-
 %changelog
 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.8-6
 - Initial release for TDE 14.0.0