The package rpms/darktable.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/darktable.git/commit/?id=6d0f75b4....
Change:
-%ifnarch ppc64le
Thanks.
Full change:
============
commit 11b2161d42d5ac950b8de24ead05a20757578963
Author: Germano Massullo <germano.massullo(a)gmail.com>
Date: Sat Oct 3 20:44:56 2020 +0200
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 <germano.massullo(a)gmail.com> - 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 <germano.massullo(a)gmail.com> - 3.2.1-6
- Added BuildRequires: perl-lib for Fedora > 32 and EL > 8
commit e32c790f0b75a3dd21b65fa58d705a626e551319
Author: Germano Massullo <germano.massullo(a)gmail.com>
Date: Sat Oct 3 19:36:30 2020 +0200
Added BuildRequires: perl-lib for Fedora > 32 and EL > 8
diff --git a/darktable.spec b/darktable.spec
index 204a580..99b9029 100644
--- a/darktable.spec
+++ b/darktable.spec
@@ -15,7 +15,7 @@
Name: darktable
Version: 3.2.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Utility to organize and develop raw images
License: GPLv3+
@@ -87,6 +87,11 @@ BuildRequires: osm-gps-map-devel >= 1.0
%endif
BuildRequires: perl-interpreter
BuildRequires: perl(FindBin)
+# perl-lib contains lib.pm, that was used to be included in perl-interpreter
+# but on Fedora >= 33 it has been splitted to perl-lib
+%if ((0%{?el} > 8) || (0%{?fedora} > 32))
+BuildRequires: perl-lib
+%endif
BuildRequires: pkgconfig >= 0.22
BuildRequires: po4a
BuildRequires: /usr/bin/pod2man
@@ -261,6 +266,9 @@ appstream-util validate-relax --nonet
%{buildroot}/%{_datadir}/appdata/darktable
%{_libexecdir}/darktable/tools/subr.sh
%changelog
+* Sat Oct 03 2020 Germano Massullo <germano.massullo(a)gmail.com> - 3.2.1-6
+- Added BuildRequires: perl-lib for Fedora > 32 and EL > 8
+
* Fri Oct 02 2020 Germano Massullo <germano.massullo(a)gmail.com> - 3.2.1-5
- Fixed Lua macros
- Fixed errors of new cmake macros
commit 6c476c3ecf71a6963c7df21cd684b6b18c3ec391
Author: Germano Massullo <germano.massullo(a)gmail.com>
Date: Sat Oct 3 18:38:27 2020 +0200
Fixed errors of new cmake macros
diff --git a/darktable.spec b/darktable.spec
index 48552f3..204a580 100644
--- a/darktable.spec
+++ b/darktable.spec
@@ -63,7 +63,7 @@ BuildRequires: lcms2-devel
BuildRequires: lensfun-devel
BuildRequires: libappstream-glib
# libavif is not available in EPEL 8
-%if ((0%{?el} >= 9) || (0%{?fedora} >= 33))
+%if ((0%{?el} > 8) || (0%{?fedora} >= 33))
BuildRequires: cmake(libavif)
%endif
BuildRequires: libcurl-devel >= 7.18.0
@@ -155,8 +155,8 @@ 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 >= 8
-%if ((0%{?el} >= 8) || (0%{?fedora}))
+# Remove bundled lua on Fedora and EL > 7
+%if ((0%{?el} > 7) || (0%{?fedora}))
rm -rf src/external/lua/
%endif
@@ -178,6 +178,28 @@ pushd %{_target_platform}
-DUSE_OPENCL=OFF \
%endif
..
+%endif
+#
+# Germano Massullo: I wanted to use %%elseif but it is not yet active in
+# Fedora, etc., despite is supported upstream. I did not compare the Fedora RPM version
+# but I empirically verified that %%elseif and %%elif do not work here, even if you
don't get
+# errors during builds
+#
https://github.com/rpm-software-management/rpm/issues/311
+#
https://github.com/debbuild/debbuild/issues/182
+#
+#
+%if (0%{?el8} || (0%{?fedora} < 33))
+mkdir %{_target_platform}
+pushd %{_target_platform}
+%cmake \
+ -DCMAKE_LIBRARY_PATH:PATH=%{_libdir} \
+ -DUSE_GEO:BOOLEAN=ON \
+ -DCMAKE_BUILD_TYPE:STRING=Release \
+ -DBINARY_PACKAGE_BUILD=1 \
+ -DDONT_USE_INTERNAL_LUA=ON \
+ -DBUILD_NOISE_TOOLS=ON \
+ -DRAWSPEED_ENABLE_LTO=%{_use_rawspeed_lto} \
+ ..
%else
%cmake \
-DCMAKE_LIBRARY_PATH:PATH=%{_libdir} \
@@ -187,10 +209,9 @@ pushd %{_target_platform}
-DDONT_USE_INTERNAL_LUA=ON \
-DBUILD_NOISE_TOOLS=ON \
-DRAWSPEED_ENABLE_LTO=%{_use_rawspeed_lto}
-# /el7
%endif
-%if ((0%{?el} >= 8) || (0%{?fedora} >= 33))
+%if ((0%{?el} > 8) || (0%{?fedora} > 32))
%cmake_build
%else
%make_build
@@ -199,7 +220,7 @@ popd
%install
-%if ((0%{?el} >= 8) || (0%{?fedora} >= 33))
+%if ((0%{?el} > 8) || (0%{?fedora} > 32))
%cmake_install
%else
pushd %{_target_platform}
@@ -242,6 +263,7 @@ appstream-util validate-relax --nonet
%{buildroot}/%{_datadir}/appdata/darktable
%changelog
* Fri Oct 02 2020 Germano Massullo <germano.massullo(a)gmail.com> - 3.2.1-5
- Fixed Lua macros
+- Fixed errors of new cmake macros
* Sat Sep 26 2020 Andreas Schneider <asn(a)redhat.com> - 3.2.1-4
- Fix build with new cmake macros
commit 8e01e33756e2b223ff9426beaf4b5a1305862cfb
Author: Germano Massullo <germano.massullo(a)gmail.com>
Date: Sat Oct 3 00:40:29 2020 +0200
fixed EL version for libavif
diff --git a/darktable.spec b/darktable.spec
index a0a1861..48552f3 100644
--- a/darktable.spec
+++ b/darktable.spec
@@ -15,7 +15,7 @@
Name: darktable
Version: 3.2.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Utility to organize and develop raw images
License: GPLv3+
@@ -62,7 +62,8 @@ BuildRequires: json-glib-devel
BuildRequires: lcms2-devel
BuildRequires: lensfun-devel
BuildRequires: libappstream-glib
-%if ((0%{?el} >= 8) || (0%{?fedora} >= 33))
+# libavif is not available in EPEL 8
+%if ((0%{?el} >= 9) || (0%{?fedora} >= 33))
BuildRequires: cmake(libavif)
%endif
BuildRequires: libcurl-devel >= 7.18.0
@@ -239,7 +240,7 @@ appstream-util validate-relax --nonet
%{buildroot}/%{_datadir}/appdata/darktable
%{_libexecdir}/darktable/tools/subr.sh
%changelog
-* Fri Oct 02 2020 Germano Massullo <germano.massullo(a)gmail.com> - 3.2.1-4
+* Fri Oct 02 2020 Germano Massullo <germano.massullo(a)gmail.com> - 3.2.1-5
- Fixed Lua macros
* Sat Sep 26 2020 Andreas Schneider <asn(a)redhat.com> - 3.2.1-4
commit eb9a86b8f2e7f64d295ea65eed3662f165c9bc44
Author: Germano Massullo <germano.massullo(a)gmail.com>
Date: Sat Oct 3 00:31:35 2020 +0200
fixed EL macros
diff --git a/darktable.spec b/darktable.spec
index 4c2f231..a0a1861 100644
--- a/darktable.spec
+++ b/darktable.spec
@@ -62,7 +62,7 @@ BuildRequires: json-glib-devel
BuildRequires: lcms2-devel
BuildRequires: lensfun-devel
BuildRequires: libappstream-glib
-%if ((0%{?el} >= 9) || (0%{?fedora} >= 33))
+%if ((0%{?el} >= 8) || (0%{?fedora} >= 33))
BuildRequires: cmake(libavif)
%endif
BuildRequires: libcurl-devel >= 7.18.0
@@ -189,7 +189,7 @@ pushd %{_target_platform}
# /el7
%endif
-%if ((0%{?el} >= 9) || (0%{?fedora} >= 33))
+%if ((0%{?el} >= 8) || (0%{?fedora} >= 33))
%cmake_build
%else
%make_build
@@ -198,7 +198,7 @@ popd
%install
-%if ((0%{?el} >= 9) || (0%{?fedora} >= 33))
+%if ((0%{?el} >= 8) || (0%{?fedora} >= 33))
%cmake_install
%else
pushd %{_target_platform}
commit 0eaa23994687720acac0cf17ab5b390a6d69a336
Author: Germano Massullo <germano.massullo(a)gmail.com>
Date: Sat Oct 3 00:10:31 2020 +0200
fixed some lua macros
diff --git a/darktable.spec b/darktable.spec
index 14c6e9b..4c2f231 100644
--- a/darktable.spec
+++ b/darktable.spec
@@ -15,7 +15,7 @@
Name: darktable
Version: 3.2.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Utility to organize and develop raw images
License: GPLv3+
@@ -74,8 +74,8 @@ BuildRequires: libsecret-devel
BuildRequires: libsoup-devel
BuildRequires: libtiff-devel
BuildRequires: libwebp-devel
-# Fedora uses Fedora lua, EPEL7 uses bundled lua
-%if 0%{?fedora}
+# 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
@@ -154,8 +154,8 @@ from the darktable package.
rm -rf src/external/CL
sed -i -e 's, \"external/CL/\*\.h\" , ,' src/CMakeLists.txt
-# Remove bundled lua on Fedora
-%if 0%{?fedora}
+# Remove bundled lua on Fedora and EL >= 8
+%if ((0%{?el} >= 8) || (0%{?fedora}))
rm -rf src/external/lua/
%endif
@@ -239,6 +239,9 @@ appstream-util validate-relax --nonet
%{buildroot}/%{_datadir}/appdata/darktable
%{_libexecdir}/darktable/tools/subr.sh
%changelog
+* Fri Oct 02 2020 Germano Massullo <germano.massullo(a)gmail.com> - 3.2.1-4
+- Fixed Lua macros
+
* Sat Sep 26 2020 Andreas Schneider <asn(a)redhat.com> - 3.2.1-4
- Fix build with new cmake macros
commit 6da22262f193edd657b4413b596bf3115dfb15bd
Author: Andreas Schneider <asn(a)cryptomilk.org>
Date: Sun Sep 27 20:32:03 2020 +0200
Use new cmake macros on fedora >= 33
diff --git a/darktable.spec b/darktable.spec
index 0a69eab..14c6e9b 100644
--- a/darktable.spec
+++ b/darktable.spec
@@ -18,10 +18,10 @@ Version: 3.2.1
Release: 3%{?dist}
Summary: Utility to organize and develop raw images
-
License: GPLv3+
URL:
http://www.darktable.org/
-Source0:
https://github.com/darktable-org/darktable/releases/download/release-%(echo
%{version} | sed 's/~//')/darktable-%(echo %{version} | sed
's/~/./').tar.xz
+
+Source0:
https://github.com/darktable-org/darktable/releases/download/release-%{ve...
#
https://github.com/darktable-org/darktable/pull/4445
Patch0: appdata-file.patch
@@ -148,7 +148,7 @@ Another option to solve the same problem might be the darktable-chart
module
from the darktable package.
%prep
-%autosetup -p1 -n 'darktable-%{version}'
+%autosetup -p1
# Remove bundled OpenCL headers.
rm -rf src/external/CL
@@ -162,11 +162,9 @@ rm -rf src/external/lua/
%build
%if 0%{?el7}
. /opt/rh/devtoolset-7/enable
-%endif
+# bundled lua is enabled on EPEL7
mkdir %{_target_platform}
pushd %{_target_platform}
-# bundled lua is enabled on EPEL7
-%if 0%{?el7}
%cmake3 \
-DCMAKE_LIBRARY_PATH:PATH=%{_libdir} \
-DUSE_GEO:BOOLEAN=ON \
@@ -187,27 +185,27 @@ pushd %{_target_platform}
-DBINARY_PACKAGE_BUILD=1 \
-DDONT_USE_INTERNAL_LUA=ON \
-DBUILD_NOISE_TOOLS=ON \
- -DRAWSPEED_ENABLE_LTO=%{_use_rawspeed_lto} \
- ..
+ -DRAWSPEED_ENABLE_LTO=%{_use_rawspeed_lto}
+# /el7
%endif
%if ((0%{?el} >= 9) || (0%{?fedora} >= 33))
%cmake_build
%else
%make_build
-%endif
popd
+%endif
%install
-pushd %{_target_platform}
%if ((0%{?el} >= 9) || (0%{?fedora} >= 33))
%cmake_install
%else
+pushd %{_target_platform}
%make_install
-%endif
popd
-find %{buildroot} -name '*.la' -exec rm -f {} ';'
+%endif
+
%find_lang %{name}
rm -rf %{buildroot}%{_datadir}/doc/darktable
appstream-util validate-relax --nonet
%{buildroot}/%{_datadir}/appdata/darktable.appdata.xml
@@ -241,6 +239,9 @@ appstream-util validate-relax --nonet
%{buildroot}/%{_datadir}/appdata/darktable
%{_libexecdir}/darktable/tools/subr.sh
%changelog
+* Sat Sep 26 2020 Andreas Schneider <asn(a)redhat.com> - 3.2.1-4
+- Fix build with new cmake macros
+
* Fri Sep 25 2020 Germano Massullo <germano.massullo(a)gmail.com> - 3.2.1-3
- resumed OpenMP on ppc64le aarch64
- resumed OpenCL on ppc64le
commit 02bbdfebf6257d79482a274dbc99989a5ff71bbb
Author: Germano Massullo <germano.massullo(a)gmail.com>
Date: Sat Sep 26 01:06:26 2020 +0200
added comment about 0001.patch
diff --git a/darktable.spec b/darktable.spec
index 19ca91b..0a69eab 100644
--- a/darktable.spec
+++ b/darktable.spec
@@ -25,6 +25,7 @@ Source0:
https://github.com/darktable-org/darktable/releases/download/release-%(
#
https://github.com/darktable-org/darktable/pull/4445
Patch0: appdata-file.patch
+#
https://github.com/darktable-org/darktable/pull/6380
Patch1: 0001.patch
BuildRequires: cairo-devel
commit 6d0f75b44b3ef4800dda4dbb3fb7789ba7a3f79a
Author: Germano Massullo <germano.massullo(a)gmail.com>
Date: Sat Sep 26 00:37:35 2020 +0200
removed %ifnarch ppc64le %{_bindir}/darktable-cltest
diff --git a/darktable.spec b/darktable.spec
index e5c5bd9..19ca91b 100644
--- a/darktable.spec
+++ b/darktable.spec
@@ -217,9 +217,8 @@ appstream-util validate-relax --nonet
%{buildroot}/%{_datadir}/appdata/darktable
%{_bindir}/darktable
%{_bindir}/darktable-chart
%{_bindir}/darktable-cli
-%ifnarch ppc64le
+
%{_bindir}/darktable-cltest
-%endif
%{_bindir}/darktable-cmstest
%{_bindir}/darktable-generate-cache
%{_bindir}/darktable-rs-identify
@@ -245,6 +244,7 @@ appstream-util validate-relax --nonet
%{buildroot}/%{_datadir}/appdata/darktable
- resumed OpenMP on ppc64le aarch64
- resumed OpenCL on ppc64le
- added 0001.patch
+- removed %%ifnarch ppc64le %%{_bindir}/darktable-cltest
* Fri Sep 25 2020 Germano Massullo <germano.massullo(a)gmail.com> - 3.2.1-2
- Introduced new cmake macros for Fedora >= 33 and EL >= 9
https://fedoraproject.org/wiki/Changes/CMake_to_do_out-of-source_builds
commit a5cce1fdaf297458e6b659950abf87ef8d91f24b
Author: Germano Massullo <germano.massullo(a)gmail.com>
Date: Sat Sep 26 00:20:13 2020 +0200
added 0001.patch
diff --git a/0001.patch b/0001.patch
new file mode 100644
index 0000000..0347f61
--- /dev/null
+++ b/0001.patch
@@ -0,0 +1,11 @@
+diff -urNr darktable-3.2.1-orig/src/imageio/format/avif.c
darktable-3.2.1/src/imageio/format/avif.c
+--- darktable-3.2.1-orig/src/imageio/format/avif.c 2020-08-04 13:51:32.000000000 +0200
++++ darktable-3.2.1/src/imageio/format/avif.c 2020-09-26 00:17:26.541623894 +0200
+@@ -23,6 +23,7 @@
+ #endif
+
+ #include <inttypes.h>
++#include <stdbool.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+
diff --git a/darktable.spec b/darktable.spec
index 7d6cd27..e5c5bd9 100644
--- a/darktable.spec
+++ b/darktable.spec
@@ -15,7 +15,7 @@
Name: darktable
Version: 3.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Utility to organize and develop raw images
@@ -25,6 +25,7 @@ Source0:
https://github.com/darktable-org/darktable/releases/download/release-%(
#
https://github.com/darktable-org/darktable/pull/4445
Patch0: appdata-file.patch
+Patch1: 0001.patch
BuildRequires: cairo-devel
BuildRequires: clang >= 3.9
@@ -178,7 +179,6 @@ pushd %{_target_platform}
%endif
..
%else
-# Concerning %%ifarch ppc64le aarch64 read
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91920
%cmake \
-DCMAKE_LIBRARY_PATH:PATH=%{_libdir} \
-DUSE_GEO:BOOLEAN=ON \
@@ -187,14 +187,6 @@ pushd %{_target_platform}
-DDONT_USE_INTERNAL_LUA=ON \
-DBUILD_NOISE_TOOLS=ON \
-DRAWSPEED_ENABLE_LTO=%{_use_rawspeed_lto} \
- %ifarch ppc64le
- -DUSE_OPENCL=OFF \
- %endif
- %if 0%{?fedora} >= 30
- %ifarch ppc64le aarch64
- -DUSE_OPENMP=OFF \
- %endif
- %endif
..
%endif
@@ -249,6 +241,11 @@ appstream-util validate-relax --nonet
%{buildroot}/%{_datadir}/appdata/darktable
%{_libexecdir}/darktable/tools/subr.sh
%changelog
+* Fri Sep 25 2020 Germano Massullo <germano.massullo(a)gmail.com> - 3.2.1-3
+- resumed OpenMP on ppc64le aarch64
+- resumed OpenCL on ppc64le
+- added 0001.patch
+
* Fri Sep 25 2020 Germano Massullo <germano.massullo(a)gmail.com> - 3.2.1-2
- Introduced new cmake macros for Fedora >= 33 and EL >= 9
https://fedoraproject.org/wiki/Changes/CMake_to_do_out-of-source_builds
- Added BuildRequires: perl(FindBin)
commit cb518b5fa60955257b0221d2914d6b76a51e9531
Author: Germano Massullo <germano.massullo(a)gmail.com>
Date: Fri Sep 25 23:50:11 2020 +0200
new cmake macros, added libavif, perl(FindBin)
diff --git a/darktable.spec b/darktable.spec
index 46eac93..7d6cd27 100644
--- a/darktable.spec
+++ b/darktable.spec
@@ -15,7 +15,7 @@
Name: darktable
Version: 3.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Utility to organize and develop raw images
@@ -60,6 +60,9 @@ BuildRequires: json-glib-devel
BuildRequires: lcms2-devel
BuildRequires: lensfun-devel
BuildRequires: libappstream-glib
+%if ((0%{?el} >= 9) || (0%{?fedora} >= 33))
+BuildRequires: cmake(libavif)
+%endif
BuildRequires: libcurl-devel >= 7.18.0
BuildRequires: libgphoto2-devel >= 2.4.5
BuildRequires: libjpeg-devel
@@ -80,6 +83,7 @@ BuildRequires: openjpeg2-devel
BuildRequires: osm-gps-map-devel >= 1.0
%endif
BuildRequires: perl-interpreter
+BuildRequires: perl(FindBin)
BuildRequires: pkgconfig >= 0.22
BuildRequires: po4a
BuildRequires: /usr/bin/pod2man
@@ -194,14 +198,21 @@ pushd %{_target_platform}
..
%endif
-
-%make_build VERBOSE=1
+%if ((0%{?el} >= 9) || (0%{?fedora} >= 33))
+%cmake_build
+%else
+%make_build
+%endif
popd
%install
-pushd %{_target_platform}
+pushd %{_target_platform}
+%if ((0%{?el} >= 9) || (0%{?fedora} >= 33))
+%cmake_install
+%else
%make_install
+%endif
popd
find %{buildroot} -name '*.la' -exec rm -f {} ';'
%find_lang %{name}
@@ -238,6 +249,11 @@ appstream-util validate-relax --nonet
%{buildroot}/%{_datadir}/appdata/darktable
%{_libexecdir}/darktable/tools/subr.sh
%changelog
+* Fri Sep 25 2020 Germano Massullo <germano.massullo(a)gmail.com> - 3.2.1-2
+- Introduced new cmake macros for Fedora >= 33 and EL >= 9
https://fedoraproject.org/wiki/Changes/CMake_to_do_out-of-source_builds
+- Added BuildRequires: perl(FindBin)
+- Added BuildRequires: cmake(libavif) for Fedora >= 33 and EL >= 9
+
* Mon Aug 10 2020 Germano Massullo <germano.massullo(a)gmail.com> - 3.2.1-1
- 3.2.1 release