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

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

1 files changed, 52 insertions, 10 deletions

diff --git a/redhat/applications/multimedia/amarok/amarok.spec b/redhat/applications/multimedia/amarok/amarok.spec
index d0aa408ce..2f5b51151 100644
--- a/redhat/applications/multimedia/amarok/amarok.spec
+++ b/redhat/applications/multimedia/amarok/amarok.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 amarok
 %define tde_prefix /opt/trinity
@@ -72,7 +72,11 @@ BuildRequires:	pkgconfig
 BuildRequires:	gettext
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # SUSE desktop files utility
 %if 0%{?suse_version}
@@ -84,11 +88,15 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
-# ALSA support
-BuildRequires:	alsa-lib-devel
+# ALSA supportl
+%if 0%{?mdkver}
+BuildRequires: %{_lib}asound-devel
+%else
+BuildRequires: alsa-lib-devel
+%endif
 
 # ESOUND support
-BuildRequires:	esound-devel
+#BuildRequires:	esound-devel
 
 # PCRE support
 BuildRequires:	pcre-devel
@@ -106,9 +114,21 @@ BuildRequires:	libusb-compat-0.1-devel
 BuildRequires:	libusb-devel
 %endif
 BuildRequires:	mysql-devel
-BuildRequires:	SDL-devel
 BuildRequires:	taglib-devel
-BuildRequires:	sqlite-devel
+
+# SDL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}SDL-devel
+%else
+BuildRequires:	SDL-devel
+%endif
+
+# SQLITE3 support
+%if 0%{?mgaversion}
+BuildRequires: sqlite3-devel
+%else
+BuildRequires: sqlite-devel
+%endif
 
 # POSTGRESQL support
 BuildRequires:	postgresql
@@ -153,13 +173,13 @@ BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
 %if 0%{?pclinuxos} == 0
 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_ifp 1
-BuildRequires:	libifp-devel
+BuildRequires:	%{_lib}ifp-devel
 %endif
 %endif
 
 # KARMA support
 %if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos} == 0
+%if 0%{?pclinuxos} == 0 && 0%{?mdkver} < 24090000
 %define with_karma 1
 BuildRequires:	libkarma-devel
 BuildRequires:	karma-sharp
@@ -175,29 +195,45 @@ BuildRequires:	libgpod-devel >= 0.4.2
 # MTP players
 %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
 %define with_mtp 1
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}mtp-devel
+%else
 BuildRequires:	libmtp-devel
 %endif
+%endif
 
 # Creative Nomad Jukebox
 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220
 %define with_njb 1
-BuildRequires:	libnjb-devel
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}njb-devel
+%else
+BuildRequires:	libmtp-devel
+%endif
 %endif
 
 # VISUAL support
 %if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
 %define with_libvisual 1
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}visual-devel
+%else
 BuildRequires:	libvisual-devel
 %endif
+%endif
 
 # MUSICBRAINZ support
 %if 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version}
 %if 0%{?fedora} >= 24
 BuildRequires:	libmusicbrainz5-devel
 %else
+%if 0%{?mgaversion} >= 9
+BuildRequires:	%{_lib}musicbrainz5-devel
+%else
 BuildRequires:	libmusicbrainz-devel
 %endif
 %endif
+%endif
 
 # TUNEPIMP support
 %if 0%{?pclinuxos}
@@ -232,8 +268,12 @@ BuildRequires: xine-lib-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
 %define with_xine 1
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xine-devel
+%else
 BuildRequires: %{_lib}xine1.2-devel
 %endif
+%endif
 %if 0%{?sle_version} && 0%{?sle_version} <= 150000
 %define with_xine 1
 BuildRequires: libxine-devel
@@ -252,9 +292,11 @@ BuildRequires:	trinity-akode-devel
 
 # MP4V2 support
 %if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?mdkver} < 24090000
 %define with_mp4v2 1
 BuildRequires:	libmp4v2-devel
 %endif
+%endif
 
 # ruby
 BuildRequires:	ruby
@@ -471,7 +513,7 @@ if [ -d /usr/X11R6 ]; then
   export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 fi
 
-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