From ac47c91c6c011631186592695e4251a3bb97dcca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= 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 --- redhat/libraries/libkexiv2/libkexiv2.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'redhat/libraries/libkexiv2/libkexiv2.spec') diff --git a/redhat/libraries/libkexiv2/libkexiv2.spec b/redhat/libraries/libkexiv2/libkexiv2.spec index 5b6d29cc1..c44f92c28 100644 --- a/redhat/libraries/libkexiv2/libkexiv2.spec +++ b/redhat/libraries/libkexiv2/libkexiv2.spec @@ -22,7 +22,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 libkexiv2 %define tde_prefix /opt/trinity @@ -86,7 +86,11 @@ BuildRequires: libexiv2-devel BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif %description @@ -149,7 +153,7 @@ Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata. 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 -- cgit v1.2.1