From 11b2161d42d5ac950b8de24ead05a20757578963 Mon Sep 17 00:00:00 2001 From: Germano Massullo Date: Oct 03 2020 18:44:56 +0000 Subject: enabled bundled Lua --- diff --git a/darktable.spec b/darktable.spec index 99b9029..136ca2a 100644 --- a/darktable.spec +++ b/darktable.spec @@ -15,7 +15,7 @@ Name: darktable Version: 3.2.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Utility to organize and develop raw images License: GPLv3+ @@ -75,10 +75,6 @@ BuildRequires: libsecret-devel BuildRequires: libsoup-devel BuildRequires: libtiff-devel BuildRequires: libwebp-devel -# Fedora and EL >= 8 uses system lua, EL7 uses bundled lua -%if ((0%{?el} >= 8) || (0%{?fedora})) -BuildRequires: lua-devel >= 5.3 -%endif BuildRequires: opencl-headers BuildRequires: OpenEXR-devel >= 1.6 BuildRequires: openjpeg2-devel @@ -108,9 +104,7 @@ Requires: iso-codes >= 3.66 # Concerning rawspeed bundled library, see # https://fedorahosted.org/fpc/ticket/550#comment:9 Provides: bundled(rawspeed) -%if 0%{?el7} Provides: bundled(lua) -%endif # uses xmmintrin.h %if (0%{?fedora} || 0%{?el7}) @@ -160,15 +154,10 @@ from the darktable package. rm -rf src/external/CL sed -i -e 's, \"external/CL/\*\.h\" , ,' src/CMakeLists.txt -# Remove bundled lua on Fedora and EL > 7 -%if ((0%{?el} > 7) || (0%{?fedora})) -rm -rf src/external/lua/ -%endif %build %if 0%{?el7} . /opt/rh/devtoolset-7/enable -# bundled lua is enabled on EPEL7 mkdir %{_target_platform} pushd %{_target_platform} %cmake3 \ @@ -201,7 +190,7 @@ pushd %{_target_platform} -DUSE_GEO:BOOLEAN=ON \ -DCMAKE_BUILD_TYPE:STRING=Release \ -DBINARY_PACKAGE_BUILD=1 \ - -DDONT_USE_INTERNAL_LUA=ON \ + -DDONT_USE_INTERNAL_LUA=OFF \ -DBUILD_NOISE_TOOLS=ON \ -DRAWSPEED_ENABLE_LTO=%{_use_rawspeed_lto} \ .. @@ -211,7 +200,7 @@ pushd %{_target_platform} -DUSE_GEO:BOOLEAN=ON \ -DCMAKE_BUILD_TYPE:STRING=Release \ -DBINARY_PACKAGE_BUILD=1 \ - -DDONT_USE_INTERNAL_LUA=ON \ + -DDONT_USE_INTERNAL_LUA=OFF \ -DBUILD_NOISE_TOOLS=ON \ -DRAWSPEED_ENABLE_LTO=%{_use_rawspeed_lto} %endif @@ -266,6 +255,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/darktable %{_libexecdir}/darktable/tools/subr.sh %changelog +* Sat Oct 03 2020 Germano Massullo - 3.2.1-7 +- enabled bundled Lua, because darktable does not support Lua 5.4 that is shipped in Fedora and EPEL 8 + * Sat Oct 03 2020 Germano Massullo - 3.2.1-6 - Added BuildRequires: perl-lib for Fedora > 32 and EL > 8