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/libkdcraw/libkdcraw.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'redhat/libraries/libkdcraw') diff --git a/redhat/libraries/libkdcraw/libkdcraw.spec b/redhat/libraries/libkdcraw/libkdcraw.spec index 05f951ecc..e881fc9b8 100644 --- a/redhat/libraries/libkdcraw/libkdcraw.spec +++ b/redhat/libraries/libkdcraw/libkdcraw.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 libkdcraw %define tde_prefix /opt/trinity @@ -74,7 +74,12 @@ BuildRequires: lcms-devel %endif # JPEG support -BuildRequires: libjpeg-devel +%if 0%{?mdkver} +%define libjpeg %{_lib}jpeg +%else +%define libjpeg libjpeg +%endif +BuildRequires: %{libjpeg}-devel # AUTOTOOLS %if 0%{?mgaversion} || 0%{?mdkversion} @@ -168,7 +173,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