diff options
| author | François Andriot <albator78@libertysurf.fr> | 2024-06-13 08:37:13 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2024-06-13 08:38:31 +0200 |
| commit | ac47c91c6c011631186592695e4251a3bb97dcca (patch) | |
| tree | d91e4e98d96b4b2618d9fb3b879c28b67fc63a8f /redhat/core/tdetoys | |
| parent | 1488354ed514d043f0c15ddbe8b9aa7c0b43f46c (diff) | |
| download | tde-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/core/tdetoys')
| -rw-r--r-- | redhat/core/tdetoys/tdetoys.spec | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/redhat/core/tdetoys/tdetoys.spec b/redhat/core/tdetoys/tdetoys.spec index eb823346d..48cf7218a 100644 --- a/redhat/core/tdetoys/tdetoys.spec +++ b/redhat/core/tdetoys/tdetoys.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 tdetoys %define tde_prefix /opt/trinity @@ -93,13 +93,21 @@ BuildRequires: gamin-devel %endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # PCRE support BuildRequires: pcre-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif Obsoletes: trinity-kdetoys < %{?epoch:%{epoch}:}%{version}-%{release} @@ -399,7 +407,7 @@ This package is part of Trinity, and a component of the TDE toys module. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${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 |