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

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

1 files changed, 15 insertions, 4 deletions

diff --git a/redhat/applications/system/tdedocker/tdedocker.spec b/redhat/applications/system/tdedocker/tdedocker.spec
index 1b7f796f1..811015d8d 100644
--- a/redhat/applications/system/tdedocker/tdedocker.spec
+++ b/redhat/applications/system/tdedocker/tdedocker.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 tdedocker
 %define tde_prefix /opt/trinity
@@ -66,16 +66,28 @@ BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # IDN support
 BuildRequires:	libidn-devel
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 # XKBFILES support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}xkbfile-devel
+%else
 BuildRequires:	libxkbfile-devel
+%endif
 
 # XMU support
 %if 0%{?suse_version} == 1140
@@ -85,7 +97,7 @@ BuildRequires:	xorg-x11-libXmu-devel
 BuildRequires: libXmu-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion} >= 4
-BuildRequires: libxmu-devel
+BuildRequires: %{_lib}xmu-devel
 %endif
 %if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3
 BuildRequires:	%{_lib}xmu%{?mgaversion:6}-devel
@@ -136,7 +148,7 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
-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
@@ -190,7 +202,6 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_tdeappdir}/tdedocker.desktop
 %{tde_datadir}/apps/tdedocker/
 %{tde_datadir}/icons/hicolor/*/apps/tdedocker.png
-%{tde_datadir}/apps/tdedocker/icons/question.png
 %{tde_mandir}/man1/tdedocker.1*