From ac47c91c6c011631186592695e4251a3bb97dcca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Thu, 13 Jun 2024 08:37:13 +0200
Subject: RPM: synchronize redhat directory with r14.1.x branch
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: François Andriot <albator78@libertysurf.fr>
---
 redhat/applications/games/knights/knights.spec     | 12 ++++++++++--
 redhat/applications/games/tdepacman/tdepacman.spec |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'redhat/applications/games')

diff --git a/redhat/applications/games/knights/knights.spec b/redhat/applications/games/knights/knights.spec
index 027d087be..5962f316b 100644
--- a/redhat/applications/games/knights/knights.spec
+++ b/redhat/applications/games/knights/knights.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 knights
 %define tde_prefix /opt/trinity
@@ -67,13 +67,21 @@ BuildRequires:	pkgconfig
 BuildRequires:	libtool
 
 # 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
 
 # SUSE desktop files utility
 %if 0%{?suse_version}
@@ -121,7 +129,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
diff --git a/redhat/applications/games/tdepacman/tdepacman.spec b/redhat/applications/games/tdepacman/tdepacman.spec
index 348b72e65..3c4989111 100644
--- a/redhat/applications/games/tdepacman/tdepacman.spec
+++ b/redhat/applications/games/tdepacman/tdepacman.spec
@@ -18,7 +18,7 @@
 # Default version for this component
 %define tde_pkg tdepacman
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
 %endif
 
 # TDE specific building variables
@@ -93,7 +93,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
-- 
cgit v1.2.1