summaryrefslogtreecommitdiffstats
path: root/redhat/applications/settings/wlassistant
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2024-06-13 08:37:13 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2024-06-13 08:38:31 +0200
commitac47c91c6c011631186592695e4251a3bb97dcca (patch)
treed91e4e98d96b4b2618d9fb3b879c28b67fc63a8f /redhat/applications/settings/wlassistant
parent1488354ed514d043f0c15ddbe8b9aa7c0b43f46c (diff)
downloadtde-packaging-ac47c91c6c011631186592695e4251a3bb97dcca.tar.gz
tde-packaging-ac47c91c6c011631186592695e4251a3bb97dcca.zip
RPM: synchronize redhat directory with r14.1.x branch
Signed-off-by: François Andriot <albator78@libertysurf.fr>
Diffstat (limited to 'redhat/applications/settings/wlassistant')
-rw-r--r--redhat/applications/settings/wlassistant/wlassistant.spec8
1 files changed, 6 insertions, 2 deletions
diff --git a/redhat/applications/settings/wlassistant/wlassistant.spec b/redhat/applications/settings/wlassistant/wlassistant.spec
index 00322f76c..b60b75b61 100644
--- a/redhat/applications/settings/wlassistant/wlassistant.spec
+++ b/redhat/applications/settings/wlassistant/wlassistant.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 wlassistant
%define tde_prefix /opt/trinity
@@ -110,7 +110,11 @@ BuildRequires: %{python}
BuildRequires: %{python}-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
%description
@@ -143,7 +147,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