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

Signed-off-by: François Andriot <albator78@libertysurf.fr>

1 files changed, 58 insertions, 7 deletions

diff --git a/redhat/core/tdemultimedia/tdemultimedia.spec b/redhat/core/tdemultimedia/tdemultimedia.spec
index 08056f129..4aa7a0d1a 100644
--- a/redhat/core/tdemultimedia/tdemultimedia.spec
+++ b/redhat/core/tdemultimedia/tdemultimedia.spec
@@ -22,7 +22,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 tdemultimedia
 %define tde_prefix /opt/trinity
@@ -111,21 +111,48 @@ BuildRequires:	zlib-devel
 #BuildRequires: libmusicbrainz-devel libtunepimp-devel
 
 # Audio libraries
-BuildRequires:	libvorbis-devel
 BuildRequires:	audiofile-devel
-BuildRequires:	libtheora-devel
-BuildRequires:	alsa-lib-devel 
 BuildRequires:	cdparanoia
 #BuildRequires:	libmpg123-devel
 
+# VORBIS support
+%if 0%{?mdkver} || 0%{?mgaversion}
+%define libvorbis_devel %{_lib}vorbis-devel
+%else
+%define libvorbis_devel libvorbis-devel
+%endif
+BuildRequires: %{libvorbis_devel}
+
+# THEORA
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}theora-devel
+%else
+BuildRequires:	libtheora-devel
+%endif
+
+# ALSA support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}asound-devel
+%else
+BuildRequires: alsa-lib-devel
+%endif
+
 # CDDA support
 %if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}cdda-devel
+%else
 BuildRequires:	libcdda-devel
 %endif
+%endif
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
 BuildRequires:	cdparanoia-devel
 %endif
 
+# CDIO support
+BuildRequires:	libcdio-devel
+BuildRequires:	libcdio-paranoia-devel
+
 # FLAC support
 %if 0%{?mgaversion} || 0%{?mdkversion}
 %if 0%{?pclinuxos}
@@ -140,9 +167,14 @@ BuildRequires:	flac-devel
 
 # 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
@@ -178,8 +210,12 @@ BuildRequires:	libXxf86vm-devel
 %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
@@ -212,13 +248,26 @@ BuildRequires:		libmp3lame-devel
 BuildRequires:	libidn-devel
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # ATTR support
-BuildRequires:	libattr-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define libattr_devel %{_lib}attr-devel
+%else
+%define libattr_devel libattr-devel
+%endif
+BuildRequires: %{libattr_devel}
 
 %if 0%{?fedora} || 0%{?rhel}
 BuildRequires:		lame-devel
@@ -787,6 +836,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:		Productivity/Multimedia/Other
@@ -800,7 +850,7 @@ This is the arts (TDE Sound daemon) plugin.
 %files -n trinity-libarts-mpeglib
 %defattr(-,root,root,-)
 %{tde_bindir}/mpeglibartsplay
-%{tde_libdir}/libarts_mpeglib-0.3.0.so*
+%{tde_libdir}/libarts_mpeglib-0.3.0.so.*
 %{tde_libdir}/libarts_mpeglib.la
 %{tde_libdir}/libarts_splay.so.*
 %{tde_libdir}/libarts_splay.la
@@ -1004,6 +1054,7 @@ noatun plugins.
 %{tde_libdir}/libarts_audiofile.so
 %if 0%{?with_mpeg}
 %{tde_libdir}/libarts_mpeglib.so
+%{tde_libdir}/libarts_mpeglib-0.3.0.so
 %{tde_libdir}/libarts_splay.so
 %endif
 %if 0%{?with_xine}
@@ -1067,7 +1118,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