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

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

1 files changed, 21 insertions, 5 deletions

diff --git a/redhat/core/tdeaddons/tdeaddons.spec b/redhat/core/tdeaddons/tdeaddons.spec
index 5b57a05de..a11c0c654 100644
--- a/redhat/core/tdeaddons/tdeaddons.spec
+++ b/redhat/core/tdeaddons/tdeaddons.spec
@@ -21,7 +21,7 @@
 
 # TDE variables
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
 %endif
 %define tde_pkg tdeaddons
 %define tde_prefix /opt/trinity
@@ -87,13 +87,25 @@ BuildRequires:	brp-check-trinity
 %endif
 
 # SDL support
-BuildRequires: SDL-devel
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}SDL-devel
+%else
+BuildRequires:	SDL-devel
+%endif
 
-# ALSA support
+# ALSA supportl
+%if 0%{?mdkver} >= 24090000
+BuildRequires: %{_lib}asound-devel
+%else
 BuildRequires: alsa-lib-devel
+%endif
 
 # OPENSSL support
-BuildRequires: openssl-devel
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
+BuildRequires:	openssl-devel
+%endif
 
 # IDN support
 BuildRequires:	libidn-devel
@@ -112,7 +124,11 @@ BuildRequires:	pcre-devel
 %endif
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # DB4/DB5 support
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion}
@@ -692,7 +708,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