RPM: synchronize redhat directory with r14.1.x branch

Signed-off-by: François Andriot <[email protected]>

1 files changed, 30 insertions, 4 deletions

diff --git a/redhat/applications/multimedia/kmplayer/kmplayer.spec b/redhat/applications/multimedia/kmplayer/kmplayer.spec
index 74db046b5..09a2fd48b 100644
--- a/redhat/applications/multimedia/kmplayer/kmplayer.spec
+++ b/redhat/applications/multimedia/kmplayer/kmplayer.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
 %endif
 %define tde_pkg kmplayer
 %define tde_prefix /opt/trinity
@@ -84,9 +84,14 @@ BuildRequires:	trinity-dbus-tqt-devel >= %{tde_version}
 
 # GSTREAMER support
 %if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}gstreamer-devel
+BuildRequires:	%{_lib}gst-plugins-base1.0-devel
+%else
 BuildRequires:	%{_lib}gstreamer1.0-devel
 BuildRequires:	%{_lib}gstreamer-plugins-base1.0-devel
 %endif
+%endif
 %if 0%{?rhel} == 4
 BuildRequires:	gstreamer-devel
 BuildRequires:	gstreamer-plugins-devel
@@ -104,8 +109,12 @@ BuildRequires:	gstreamer1-plugins-base-devel >= 1.0
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version}
 %define with_xine 1
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xine-devel
+%else
 BuildRequires: %{_lib}xine1.2-devel
 %endif
+%endif
 %if 0%{?fedora} || 0%{?rhel}
 BuildRequires: xine-lib-devel
 %endif
@@ -130,7 +139,11 @@ BuildRequires:	xorg-x11-libXv-devel
 %endif
 
 # GTK2 stuff
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}gtk+2.0-devel
+%else
 BuildRequires:	gtk2-devel
+%endif
 
 # DBUS stuff
 %if 0%{?suse_version}
@@ -202,8 +215,6 @@ Core files needed for KMPlayer.
 
 %files base
 %defattr(-,root,root,-)
-%{tde_libdir}/libkmplayercommon.la
-%{tde_libdir}/libkmplayercommon.so
 %{tde_bindir}/kgstplayer
 %{tde_bindir}/kxineplayer
 %dir %{tde_datadir}/config
@@ -254,6 +265,21 @@ Documention for KMPlayer, a basic audio/video viewer application for TDE.
 
 ##########
 
+%package devel
+Group:			Applications/Multimedia
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Summary:		Media player for Trinity (devlopment files)
+
+%description devel
+Development files for KMPlayer, a basic audio/video viewer application for TDE.
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_libdir}/libkmplayercommon.la
+%{tde_libdir}/libkmplayercommon.so
+
+##########
+
 %if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
@@ -269,7 +295,7 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
   %__mkdir_p build
   cd build
 fi