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=2b273659f69....
Change: +ExclusiveArch: x86_64 ppc64le
Thanks.
Full change: ============
commit 207bf4c477a3ac65649dfec43d01b8a98b86760a Author: Germano Massullo germano.massullo@gmail.com Date: Sat Apr 18 10:23:54 2020 +0200
3.0.2 release
diff --git a/.gitignore b/.gitignore index 6f7136b..4e390e6 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ /darktable-3.0.0.rc2.tar.xz /darktable-3.0.0.tar.xz /darktable-3.0.1.tar.xz +/darktable-3.0.2.tar.xz diff --git a/darktable.spec b/darktable.spec index 29ab838..79e3e5c 100644 --- a/darktable.spec +++ b/darktable.spec @@ -14,8 +14,8 @@ ###
Name: darktable -Version: 3.0.1 -Release: 3%{?dist} +Version: 3.0.2 +Release: 1%{?dist}
Summary: Utility to organize and develop raw images
@@ -240,6 +240,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/darktable %{_libexecdir}/darktable/tools/subr.sh
%changelog +* Sat Apr 18 2020 Germano Massullo germano.massullo@gmail.com - 3.0.2-1 +- rebuilt + * Sat Apr 04 2020 Germano Massullo germano.massullo@gmail.com - Enabled flickrcurl-devel and osm-gps-map-devel BuildRequires only for EL7 and Fedora - Removed aarch64 EL8 due missing colord-gtk-devel diff --git a/sources b/sources index 799aff2..c7b5571 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (darktable-3.0.1.tar.xz) = a01830c5177512fb7b59f07a5ac594b486f854d41e7123faa0252caef52386ef3df4896f2c23a61b57a2b9b7bec33f3fd2f1fce6cea1388e1b74056a159e7ffa +SHA512 (darktable-3.0.2.tar.xz) = ee2d83f60621586f9e1be958f4b0c3d2214fbf30338837dbd07b901641c32d565cd29f814f5ff75a450495acee2383aa62ba3da3873009077704c925bab501f1
commit 2b273659f69bd2cfc81a9192f0592726779246d5 Author: Germano Massullo germano.massullo@gmail.com Date: Sat Apr 4 12:54:32 2020 +0200
Removed aarch64 EL8 due missing colord-gtk-devel
diff --git a/darktable.spec b/darktable.spec index 0299e8e..29ab838 100644 --- a/darktable.spec +++ b/darktable.spec @@ -103,7 +103,14 @@ Provides: bundled(lua) %endif
# uses xmmintrin.h +%if (0%{?fedora} || 0%{?el7}) ExclusiveArch: x86_64 aarch64 ppc64le +%endif + +# dependency colord-gtk-devel is not availble on EL8 aarch64 +%if 0%{?el8} +ExclusiveArch: x86_64 ppc64le +%endif
%description Darktable is a virtual light-table and darkroom for photographers: @@ -235,6 +242,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/darktable %changelog * Sat Apr 04 2020 Germano Massullo germano.massullo@gmail.com - Enabled flickrcurl-devel and osm-gps-map-devel BuildRequires only for EL7 and Fedora +- Removed aarch64 EL8 due missing colord-gtk-devel
* Thu Mar 12 2020 Germano Massullo germano.massullo@gmail.com - 3.0.1-2 - removed -DPROJECT_VERSION:STRING="%%{name}-%%{version}-%%{release}" because version is already provided by src/version_gen.c Source: Andreas Schneider
commit 8e5a2015bcc9df6740cba03f75c7f65ceece6918 Author: Germano Massullo germano.massullo@gmail.com Date: Sat Apr 4 12:35:21 2020 +0200
fixed EPEL8 build
diff --git a/darktable.spec b/darktable.spec index c161b26..0299e8e 100644 --- a/darktable.spec +++ b/darktable.spec @@ -15,7 +15,7 @@
Name: darktable Version: 3.0.1 -Release: 2%{?dist} +Release: 3%{?dist}
Summary: Utility to organize and develop raw images
@@ -45,7 +45,9 @@ BuildRequires: devtoolset-7-toolchain BuildRequires: devtoolset-7-libatomic-devel %endif BuildRequires: exiv2-devel >= 0.24 +%if (0%{?el7} || 0%{?fedora}) BuildRequires: flickcurl-devel +%endif BuildRequires: gcc >= 5.0 BuildRequires: GraphicsMagick-devel BuildRequires: gtk3-devel >= 3.22 @@ -76,7 +78,9 @@ BuildRequires: lua-devel >= 5.3 BuildRequires: opencl-headers BuildRequires: OpenEXR-devel >= 1.6 BuildRequires: openjpeg2-devel +%if (0%{?el7} || 0%{?fedora}) BuildRequires: osm-gps-map-devel >= 1.0 +%endif BuildRequires: perl-interpreter BuildRequires: pkgconfig >= 0.22 BuildRequires: po4a @@ -229,6 +233,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/darktable %{_libexecdir}/darktable/tools/subr.sh
%changelog +* Sat Apr 04 2020 Germano Massullo germano.massullo@gmail.com +- Enabled flickrcurl-devel and osm-gps-map-devel BuildRequires only for EL7 and Fedora + * Thu Mar 12 2020 Germano Massullo germano.massullo@gmail.com - 3.0.1-2 - removed -DPROJECT_VERSION:STRING="%%{name}-%%{version}-%%{release}" because version is already provided by src/version_gen.c Source: Andreas Schneider - added %%global _use_rawspeed_lto to enable Rawspeed LTO only for distros that have GCC >= 9
commit a708cb8c17b28e9a184cc1149a6fcf9f9a297b4b Author: Germano Massullo germano.massullo@gmail.com Date: Thu Mar 12 14:01:57 2020 +0100
replaced %define with %global on _use_rawspeed_lto definition
diff --git a/darktable.spec b/darktable.spec index b8dc45d..c161b26 100644 --- a/darktable.spec +++ b/darktable.spec @@ -1,8 +1,8 @@ ### # cmake flag -DRAWSPEED_ENABLE_LTO needs GCC >= 9 and EL8 has GCC 8 -%define _use_rawspeed_lto "ON" +%global _use_rawspeed_lto "ON" %if 0%{?el8} -%define _use_rawspeed_lto "OFF" +%global _use_rawspeed_lto "OFF" %endif ###
@@ -231,7 +231,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/darktable %changelog * Thu Mar 12 2020 Germano Massullo germano.massullo@gmail.com - 3.0.1-2 - removed -DPROJECT_VERSION:STRING="%%{name}-%%{version}-%%{release}" because version is already provided by src/version_gen.c Source: Andreas Schneider -- added %%define _use_rawspeed_lto to enable Rawspeed LTO only for distros that have GCC >= 9 +- added %%global _use_rawspeed_lto to enable Rawspeed LTO only for distros that have GCC >= 9 - added 4447-legacy_params.patch
* Mon Mar 09 2020 Germano Massullo germano.massullo@gmail.com - 3.0.1-1
commit eb7949083fb9370f58659424835dac732871cc4c Author: Germano Massullo germano.massullo@gmail.com Date: Thu Mar 12 13:23:39 2020 +0100
fixed macro
diff --git a/darktable.spec b/darktable.spec index 13b664c..b8dc45d 100644 --- a/darktable.spec +++ b/darktable.spec @@ -1,7 +1,7 @@ ### # cmake flag -DRAWSPEED_ENABLE_LTO needs GCC >= 9 and EL8 has GCC 8 %define _use_rawspeed_lto "ON" -if 0%{?el8} +%if 0%{?el8} %define _use_rawspeed_lto "OFF" %endif ###
commit 80b5f0468a17e4b81b19786b766c8a46d5421a74 Author: Germano Massullo germano.massullo@gmail.com Date: Thu Mar 12 13:21:04 2020 +0100
fixed macro
diff --git a/darktable.spec b/darktable.spec index 083ef2d..13b664c 100644 --- a/darktable.spec +++ b/darktable.spec @@ -1,7 +1,7 @@ ### # cmake flag -DRAWSPEED_ENABLE_LTO needs GCC >= 9 and EL8 has GCC 8 %define _use_rawspeed_lto "ON" -if 0%{el8} +if 0%{?el8} %define _use_rawspeed_lto "OFF" %endif ###
commit b95450c25ede621945d745c4b32d4db0189eee60 Author: Germano Massullo germano.massullo@gmail.com Date: Thu Mar 12 13:19:30 2020 +0100
added 4447-legacy_params.patch
diff --git a/4447-legacy_params.patch b/4447-legacy_params.patch new file mode 100644 index 0000000..875b4e2 --- /dev/null +++ b/4447-legacy_params.patch @@ -0,0 +1,44 @@ +From 3d3526b48c3bb9b9742d72d21cfc38e76ce1885f Mon Sep 17 00:00:00 2001 +From: coolcom200 coolcom200@users.noreply.github.com +Date: Mon, 9 Mar 2020 20:47:16 -0400 +Subject: [PATCH] Fix: Missing legacy_params in Basic Adjustment module + +--- + src/iop/basicadj.c | 24 ++++++++++++++++++++++++ + 1 file changed, 24 insertions(+) + +diff --git a/src/iop/basicadj.c b/src/iop/basicadj.c +index fa24e32ae4..9b79690d7d 100644 +--- a/src/iop/basicadj.c ++++ b/src/iop/basicadj.c +@@ -90,6 +90,30 @@ typedef struct dt_iop_basicadj_global_data_t + int kernel_basicadj; + } dt_iop_basicadj_global_data_t; + ++int legacy_params(dt_iop_module_t *self, const void *const old_params, const int old_version, void *new_params, ++ const int new_version) ++{ ++ if(old_version == 1 && new_version == 2) ++ { ++ const dt_iop_basicadj_params_t *old = old_params; ++ dt_iop_basicadj_params_t *new = new_params; ++ ++ new->black_point = old->black_point; ++ new->exposure = old->exposure; ++ new->hlcompr = old->hlcompr; ++ new->hlcomprthresh = old->hlcomprthresh; ++ new->contrast = old->contrast; ++ new->preserve_colors = old->preserve_colors; ++ new->middle_grey = old->middle_grey; ++ new->brightness = old->brightness; ++ new->saturation = old->saturation; ++ new->clip = old->clip; ++ new->vibrance = 0; ++ return 0; ++ } ++ return 1; ++} ++ + const char *name() + { + return _("basic adjustments"); diff --git a/darktable.spec b/darktable.spec index 5f9b80d..083ef2d 100644 --- a/darktable.spec +++ b/darktable.spec @@ -25,6 +25,8 @@ 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/4447 +Patch1: 4447-legacy_params.patch
BuildRequires: cairo-devel BuildRequires: clang >= 3.9 @@ -230,6 +232,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/darktable * Thu Mar 12 2020 Germano Massullo germano.massullo@gmail.com - 3.0.1-2 - removed -DPROJECT_VERSION:STRING="%%{name}-%%{version}-%%{release}" because version is already provided by src/version_gen.c Source: Andreas Schneider - added %%define _use_rawspeed_lto to enable Rawspeed LTO only for distros that have GCC >= 9 +- added 4447-legacy_params.patch
* Mon Mar 09 2020 Germano Massullo germano.massullo@gmail.com - 3.0.1-1 - 3.0.1 release
commit 5b7228cb93eccd76fd931c35a2a50fb067105c51 Author: Germano Massullo germano.massullo@gmail.com Date: Thu Mar 12 13:16:40 2020 +0100
removed DPROJECT_VERSION, added _use_rawspeed_lto macro
diff --git a/darktable.spec b/darktable.spec index da3ae59..5f9b80d 100644 --- a/darktable.spec +++ b/darktable.spec @@ -1,3 +1,18 @@ +### +# cmake flag -DRAWSPEED_ENABLE_LTO needs GCC >= 9 and EL8 has GCC 8 +%define _use_rawspeed_lto "ON" +if 0%{el8} +%define _use_rawspeed_lto "OFF" +%endif +### + +### +# To build darktable from Github master branch add cmake flag -DPROJECT_VERSION="%{version}" +# darktable stable releases have src/version_gen.c file that makes +# -DPROJECT_VERSION="%{version}" no longer needed +# src/version_gen.c file is not available in darktable master Github branch instead +### + Name: darktable Version: 3.0.1 Release: 2%{?dist} @@ -142,7 +157,6 @@ pushd %{_target_platform} -DBINARY_PACKAGE_BUILD=1 \ -DDONT_USE_INTERNAL_LUA=OFF \ -DBUILD_NOISE_TOOLS=ON \ - -DPROJECT_VERSION="%{version}" \ -DRAWSPEED_ENABLE_LTO=ON \ %ifarch ppc64le -DUSE_OPENCL=OFF \ @@ -157,8 +171,7 @@ pushd %{_target_platform} -DBINARY_PACKAGE_BUILD=1 \ -DDONT_USE_INTERNAL_LUA=ON \ -DBUILD_NOISE_TOOLS=ON \ - -DPROJECT_VERSION="%{version}" \ - -DRAWSPEED_ENABLE_LTO=ON \ + -DRAWSPEED_ENABLE_LTO=%{_use_rawspeed_lto} \ %ifarch ppc64le -DUSE_OPENCL=OFF \ %endif @@ -215,7 +228,8 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/darktable
%changelog * Thu Mar 12 2020 Germano Massullo germano.massullo@gmail.com - 3.0.1-2 -- Replaced -DPROJECT_VERSION:STRING="%%{name}-%%{version}-%%{release}" with -DPROJECT_VERSION="%%{version}" Read https://cmake.org/cmake/help/v3.17/command/project.html +- removed -DPROJECT_VERSION:STRING="%%{name}-%%{version}-%%{release}" because version is already provided by src/version_gen.c Source: Andreas Schneider +- added %%define _use_rawspeed_lto to enable Rawspeed LTO only for distros that have GCC >= 9
* Mon Mar 09 2020 Germano Massullo germano.massullo@gmail.com - 3.0.1-1 - 3.0.1 release
commit ba8a3ae94c9778909ef0825d6b6893005cb7eebd Author: Germano Massullo germano.massullo@gmail.com Date: Thu Mar 12 12:15:56 2020 +0100
Replaced -DPROJECT_VERSION
diff --git a/darktable.spec b/darktable.spec index fa8a89b..da3ae59 100644 --- a/darktable.spec +++ b/darktable.spec @@ -1,6 +1,6 @@ Name: darktable Version: 3.0.1 -Release: 1%{?dist} +Release: 2%{?dist}
Summary: Utility to organize and develop raw images
@@ -142,7 +142,7 @@ pushd %{_target_platform} -DBINARY_PACKAGE_BUILD=1 \ -DDONT_USE_INTERNAL_LUA=OFF \ -DBUILD_NOISE_TOOLS=ON \ - -DPROJECT_VERSION:STRING="%{name}-%{version}-%{release}" \ + -DPROJECT_VERSION="%{version}" \ -DRAWSPEED_ENABLE_LTO=ON \ %ifarch ppc64le -DUSE_OPENCL=OFF \ @@ -157,7 +157,7 @@ pushd %{_target_platform} -DBINARY_PACKAGE_BUILD=1 \ -DDONT_USE_INTERNAL_LUA=ON \ -DBUILD_NOISE_TOOLS=ON \ - -DPROJECT_VERSION:STRING="%{name}-%{version}-%{release}" \ + -DPROJECT_VERSION="%{version}" \ -DRAWSPEED_ENABLE_LTO=ON \ %ifarch ppc64le -DUSE_OPENCL=OFF \ @@ -214,6 +214,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/darktable %{_libexecdir}/darktable/tools/subr.sh
%changelog +* Thu Mar 12 2020 Germano Massullo germano.massullo@gmail.com - 3.0.1-2 +- Replaced -DPROJECT_VERSION:STRING="%%{name}-%%{version}-%%{release}" with -DPROJECT_VERSION="%%{version}" Read https://cmake.org/cmake/help/v3.17/command/project.html + * Mon Mar 09 2020 Germano Massullo germano.massullo@gmail.com - 3.0.1-1 - 3.0.1 release - removed 0001-Add-last-two-releases-to-appdata-file.patch
commit 1ea76d85a614cf4482708ee49f6580a896240ad9 Author: Germano Massullo germano.massullo@gmail.com Date: Mon Mar 9 19:57:38 2020 +0100
3.0.1 release
diff --git a/.gitignore b/.gitignore index 6c4f76c..6f7136b 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,4 @@ /darktable-2.6.3.tar.xz /darktable-3.0.0.rc2.tar.xz /darktable-3.0.0.tar.xz +/darktable-3.0.1.tar.xz diff --git a/0001-Add-last-two-releases-to-appdata-file.patch b/0001-Add-last-two-releases-to-appdata-file.patch deleted file mode 100644 index 3659b93..0000000 --- a/0001-Add-last-two-releases-to-appdata-file.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4188852d27cc0a292956efd8ed57b66aa01829c1 Mon Sep 17 00:00:00 2001 -From: Kalev Lember klember@redhat.com -Date: Fri, 10 Jan 2020 15:05:44 +0100 -Subject: [PATCH] Add last two releases to appdata file - ---- - data/darktable.appdata.xml.in | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/data/darktable.appdata.xml.in b/data/darktable.appdata.xml.in -index 10f7cb5f1..56e08656d 100644 ---- a/data/darktable.appdata.xml.in -+++ b/data/darktable.appdata.xml.in -@@ -49,6 +49,8 @@ - </screenshots> - <content_rating type="oars-1.1" /> - <releases> -+ <release date="2019-12-24" version="3.0.0"/> -+ <release date="2019-10-20" version="2.6.3"/> - <release date="2019-03-21" version="2.6.2"/> - <release date="2019-03-07" version="2.6.1"/> - <release date="2018-12-24" version="2.6.0"/> --- -2.24.1 - diff --git a/appdata-file.patch b/appdata-file.patch new file mode 100644 index 0000000..b73bc27 --- /dev/null +++ b/appdata-file.patch @@ -0,0 +1,21 @@ +From 1758c0e5fbfafe10cd8a9e9ab6b519df39138237 Mon Sep 17 00:00:00 2001 +From: Germano Massullo Germano0@users.noreply.github.com +Date: Mon, 9 Mar 2020 19:34:11 +0100 +Subject: [PATCH] Update darktable.appdata.xml.in + +--- + data/darktable.appdata.xml.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/data/darktable.appdata.xml.in b/data/darktable.appdata.xml.in +index 56e08656d0..16f2387325 100644 +--- a/data/darktable.appdata.xml.in ++++ b/data/darktable.appdata.xml.in +@@ -49,6 +49,7 @@ + </screenshots> + <content_rating type="oars-1.1" /> + <releases> ++ <release date="2020-03-09" version="3.0.1"/> + <release date="2019-12-24" version="3.0.0"/> + <release date="2019-10-20" version="2.6.3"/> + <release date="2019-03-21" version="2.6.2"/> diff --git a/darktable.spec b/darktable.spec index bd26845..fa8a89b 100644 --- a/darktable.spec +++ b/darktable.spec @@ -1,6 +1,6 @@ Name: darktable -Version: 3.0.0 -Release: 3%{?dist} +Version: 3.0.1 +Release: 1%{?dist}
Summary: Utility to organize and develop raw images
@@ -8,8 +8,8 @@ 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
-# https://github.com/darktable-org/darktable/pull/4079 -Patch0: 0001-Add-last-two-releases-to-appdata-file.patch +# https://github.com/darktable-org/darktable/pull/4445 +Patch0: appdata-file.patch
BuildRequires: cairo-devel BuildRequires: clang >= 3.9 @@ -214,6 +214,11 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/darktable %{_libexecdir}/darktable/tools/subr.sh
%changelog +* Mon Mar 09 2020 Germano Massullo germano.massullo@gmail.com - 3.0.1-1 +- 3.0.1 release +- removed 0001-Add-last-two-releases-to-appdata-file.patch +- added appdata-file.patch + * Tue Jan 28 2020 Fedora Release Engineering releng@fedoraproject.org - 3.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
diff --git a/sources b/sources index 840afcc..799aff2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (darktable-3.0.0.tar.xz) = de154cc19281f61316363243db3e531be33ac4c4632d6277ba715884b83a3c35f1d433a0e53f5f1eb7ffe03c6fcba4629612c94f942c196807c876b421faafc6 +SHA512 (darktable-3.0.1.tar.xz) = a01830c5177512fb7b59f07a5ac594b486f854d41e7123faa0252caef52386ef3df4896f2c23a61b57a2b9b7bec33f3fd2f1fce6cea1388e1b74056a159e7ffa
commit 13d1b103f6b28b64bee844050aea6eafe0320fd5 Author: Fedora Release Engineering releng@fedoraproject.org Date: Tue Jan 28 15:19:50 2020 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org
diff --git a/darktable.spec b/darktable.spec index 8ba1aea..bd26845 100644 --- a/darktable.spec +++ b/darktable.spec @@ -1,6 +1,6 @@ Name: darktable Version: 3.0.0 -Release: 2%{?dist} +Release: 3%{?dist}
Summary: Utility to organize and develop raw images
@@ -214,6 +214,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/darktable %{_libexecdir}/darktable/tools/subr.sh
%changelog +* Tue Jan 28 2020 Fedora Release Engineering releng@fedoraproject.org - 3.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jan 10 2020 Kalev Lember klember@redhat.com - 3.0.0-2 - Add last two releases to appdata file
commit 324cf168d276c9bd9a56605f6ed3d1ba313936c9 Author: Kalev Lember klember@redhat.com Date: Fri Jan 10 15:10:15 2020 +0100
Add last two releases to appdata file
This ensures that the version is shown correctly in gnome-software.
https://github.com/darktable-org/darktable/pull/4079
diff --git a/0001-Add-last-two-releases-to-appdata-file.patch b/0001-Add-last-two-releases-to-appdata-file.patch new file mode 100644 index 0000000..3659b93 --- /dev/null +++ b/0001-Add-last-two-releases-to-appdata-file.patch @@ -0,0 +1,25 @@ +From 4188852d27cc0a292956efd8ed57b66aa01829c1 Mon Sep 17 00:00:00 2001 +From: Kalev Lember klember@redhat.com +Date: Fri, 10 Jan 2020 15:05:44 +0100 +Subject: [PATCH] Add last two releases to appdata file + +--- + data/darktable.appdata.xml.in | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/data/darktable.appdata.xml.in b/data/darktable.appdata.xml.in +index 10f7cb5f1..56e08656d 100644 +--- a/data/darktable.appdata.xml.in ++++ b/data/darktable.appdata.xml.in +@@ -49,6 +49,8 @@ + </screenshots> + <content_rating type="oars-1.1" /> + <releases> ++ <release date="2019-12-24" version="3.0.0"/> ++ <release date="2019-10-20" version="2.6.3"/> + <release date="2019-03-21" version="2.6.2"/> + <release date="2019-03-07" version="2.6.1"/> + <release date="2018-12-24" version="2.6.0"/> +-- +2.24.1 + diff --git a/darktable.spec b/darktable.spec index 9227bf4..8ba1aea 100644 --- a/darktable.spec +++ b/darktable.spec @@ -1,6 +1,6 @@ Name: darktable Version: 3.0.0 -Release: 1%{?dist} +Release: 2%{?dist}
Summary: Utility to organize and develop raw images
@@ -8,6 +8,9 @@ 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
+# https://github.com/darktable-org/darktable/pull/4079 +Patch0: 0001-Add-last-two-releases-to-appdata-file.patch + BuildRequires: cairo-devel BuildRequires: clang >= 3.9 %if 0%{?el7} @@ -113,7 +116,7 @@ Another option to solve the same problem might be the darktable-chart module from the darktable package.
%prep -%setup -q -n 'darktable-%{version}' +%autosetup -p1 -n 'darktable-%{version}'
# Remove bundled OpenCL headers. rm -rf src/external/CL @@ -211,6 +214,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/darktable %{_libexecdir}/darktable/tools/subr.sh
%changelog +* Fri Jan 10 2020 Kalev Lember klember@redhat.com - 3.0.0-2 +- Add last two releases to appdata file + * Tue Dec 24 2019 Germano Massullo germano.massullo@gmail.com - 3.0.0-1 - 3.0.0 release
commit c71561306544c0b72be07b6c19d1cda6e417b2c2 Author: Germano Massullo germano.massullo@gmail.com Date: Tue Dec 24 17:59:42 2019 +0100
3.0.0 release
diff --git a/.gitignore b/.gitignore index 96553d4..6c4f76c 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,4 @@ /darktable-2.6.2.tar.xz /darktable-2.6.3.tar.xz /darktable-3.0.0.rc2.tar.xz +/darktable-3.0.0.tar.xz diff --git a/darktable.spec b/darktable.spec index e819dbc..9227bf4 100644 --- a/darktable.spec +++ b/darktable.spec @@ -1,6 +1,6 @@ Name: darktable -Version: 3.0.0~rc2 -Release: 0.1%{?dist} +Version: 3.0.0 +Release: 1%{?dist}
Summary: Utility to organize and develop raw images
@@ -211,6 +211,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/darktable %{_libexecdir}/darktable/tools/subr.sh
%changelog +* Tue Dec 24 2019 Germano Massullo germano.massullo@gmail.com - 3.0.0-1 +- 3.0.0 release + * Mon Dec 02 2019 Germano Massullo germano.massullo@gmail.com - 3.0.0~rc2-0.1 - 3.0.0 RC 2 - cmake and cmake3 >= 3.10 diff --git a/sources b/sources index 7a82fb1..840afcc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (darktable-3.0.0.rc2.tar.xz) = 7a3eccfc9a19d3777c82ba2c47b7f52eddacfbfa62563dfd832851de5833bb1b20b27acc752441d2f5dcee534109a75566b0d12ce3d2935f81756a2e9412e484 +SHA512 (darktable-3.0.0.tar.xz) = de154cc19281f61316363243db3e531be33ac4c4632d6277ba715884b83a3c35f1d433a0e53f5f1eb7ffe03c6fcba4629612c94f942c196807c876b421faafc6
commit 7425b67268eeefe83ba4d27c6f9588e50d5f10e9 Author: Germano Massullo germano.massullo@gmail.com Date: Tue Dec 3 14:15:45 2019 +0100
resumed 0.N release nomenclature for RC
diff --git a/darktable.spec b/darktable.spec index a79de9a..e819dbc 100644 --- a/darktable.spec +++ b/darktable.spec @@ -1,6 +1,6 @@ Name: darktable Version: 3.0.0~rc2 -Release: 1%{?dist} +Release: 0.1%{?dist}
Summary: Utility to organize and develop raw images
@@ -211,7 +211,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/darktable %{_libexecdir}/darktable/tools/subr.sh
%changelog -* Mon Dec 02 2019 Germano Massullo germano.massullo@gmail.com - 3.0.0~rc2-1 +* Mon Dec 02 2019 Germano Massullo germano.massullo@gmail.com - 3.0.0~rc2-0.1 - 3.0.0 RC 2 - cmake and cmake3 >= 3.10 - pugixml-devel >= 1.8
commit 115b2cd81c116b9733313ecac5e3d64d1feef3d8 Author: Kalev Lember klember@redhat.com Date: Tue Dec 3 11:32:02 2019 +0100
Correctly use pre-release versioning with tilde
We have to be careful to not use 3.0.0.rc2 as rpm version comparison considers 3.0.0.rc2 a higher version than (upcoming) 3.0.0.
See https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_prere...
diff --git a/darktable.spec b/darktable.spec index bc60e65..a79de9a 100644 --- a/darktable.spec +++ b/darktable.spec @@ -1,12 +1,12 @@ Name: darktable -Version: 3.0.0.rc2 -Release: 0.1%{?dist} +Version: 3.0.0~rc2 +Release: 1%{?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-%%7Bver... +Source0: https://github.com/darktable-org/darktable/releases/download/release-%(echo %{version} | sed 's/~//')/darktable-%(echo %{version} | sed 's/~/./').tar.xz
BuildRequires: cairo-devel BuildRequires: clang >= 3.9 @@ -113,9 +113,7 @@ Another option to solve the same problem might be the darktable-chart module from the darktable package.
%prep -#echo directory: %%{name}-%%{version} -#%%setup -q -n 'darktable-%%{version}' -%setup -q -n 'darktable-3.0.0~rc2' +%setup -q -n 'darktable-%{version}'
# Remove bundled OpenCL headers. rm -rf src/external/CL @@ -213,17 +211,17 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/darktable %{_libexecdir}/darktable/tools/subr.sh
%changelog -* Mon Dec 02 2019 Germano Massullo germano.massullo@gmail.com - 3.0.0.rc2-0.1 +* Mon Dec 02 2019 Germano Massullo germano.massullo@gmail.com - 3.0.0~rc2-1 - 3.0.0 RC 2 - cmake and cmake3 >= 3.10 - pugixml-devel >= 1.8 - zlib-devel >= 1.2.11
-* Thu Nov 14 2019 Germano Massullo germano.massullo@gmail.com - 3.0.0.rc1-0.1 +* Thu Nov 14 2019 Germano Massullo germano.massullo@gmail.com - 3.0.0~rc1-1 - 3.0.0 RC 1
-* Tue Nov 05 2019 Germano Massullo germano.massullo@gmail.com - 3.0.0.rc0-0.1 -- 3.0.0 RC0 +* Tue Nov 05 2019 Germano Massullo germano.massullo@gmail.com - 3.0.0~rc0-1 +- 3.0.0 RC 0 - BuildRequires: gtk3-devel >= 3.22
* Wed Oct 23 2019 Germano Massullo germano.massullo@gmail.com - 2.6.3-2
commit 857c3b9283769f87d763fd7c5ad96e88857a3905 Author: Germano Massullo germano.massullo@gmail.com Date: Tue Dec 3 10:51:00 2019 +0100
3.0.0 RC2
diff --git a/.gitignore b/.gitignore index 3cfced2..96553d4 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ /darktable-2.6.1.tar.xz /darktable-2.6.2.tar.xz /darktable-2.6.3.tar.xz +/darktable-3.0.0.rc2.tar.xz diff --git a/darktable.spec b/darktable.spec index f657934..bc60e65 100644 --- a/darktable.spec +++ b/darktable.spec @@ -1,6 +1,6 @@ Name: darktable -Version: 2.6.3 -Release: 2%{?dist} +Version: 3.0.0.rc2 +Release: 0.1%{?dist}
Summary: Utility to organize and develop raw images
@@ -11,9 +11,9 @@ Source0: https://github.com/darktable-org/darktable/releases/download/release-%%7B BuildRequires: cairo-devel BuildRequires: clang >= 3.9 %if 0%{?el7} -BuildRequires: cmake3 >= 3.4 +BuildRequires: cmake3 >= 3.10 %else -BuildRequires: cmake >= 3.4 +BuildRequires: cmake >= 3.10 %endif BuildRequires: colord-gtk-devel BuildRequires: colord-devel @@ -28,7 +28,7 @@ BuildRequires: exiv2-devel >= 0.24 BuildRequires: flickcurl-devel BuildRequires: gcc >= 5.0 BuildRequires: GraphicsMagick-devel -BuildRequires: gtk3-devel >= 3.14 +BuildRequires: gtk3-devel >= 3.22 BuildRequires: intltool # iso-codes dependency not mandatory, just optional / recommended # in future please check if EL7 iso-codes version is >= 3.66 @@ -61,9 +61,9 @@ BuildRequires: perl-interpreter BuildRequires: pkgconfig >= 0.22 BuildRequires: po4a BuildRequires: /usr/bin/pod2man -BuildRequires: pugixml-devel +BuildRequires: pugixml-devel >= 1.8 BuildRequires: sqlite-devel -BuildRequires: zlib-devel +BuildRequires: zlib-devel >= 1.2.11
# iso-codes dependency not mandatory, just optional / recommended # in future please check if EL7 iso-codes version is >= 3.66 @@ -113,8 +113,9 @@ Another option to solve the same problem might be the darktable-chart module from the darktable package.
%prep -echo directory: %{name}-%{version} -%setup -q -n 'darktable-%{version}' +#echo directory: %%{name}-%%{version} +#%%setup -q -n 'darktable-%%{version}' +%setup -q -n 'darktable-3.0.0~rc2'
# Remove bundled OpenCL headers. rm -rf src/external/CL @@ -212,6 +213,19 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/darktable %{_libexecdir}/darktable/tools/subr.sh
%changelog +* Mon Dec 02 2019 Germano Massullo germano.massullo@gmail.com - 3.0.0.rc2-0.1 +- 3.0.0 RC 2 +- cmake and cmake3 >= 3.10 +- pugixml-devel >= 1.8 +- zlib-devel >= 1.2.11 + +* Thu Nov 14 2019 Germano Massullo germano.massullo@gmail.com - 3.0.0.rc1-0.1 +- 3.0.0 RC 1 + +* Tue Nov 05 2019 Germano Massullo germano.massullo@gmail.com - 3.0.0.rc0-0.1 +- 3.0.0 RC0 +- BuildRequires: gtk3-devel >= 3.22 + * Wed Oct 23 2019 Germano Massullo germano.massullo@gmail.com - 2.6.3-2 - Enabled again ppc64le and aarch64 architectures, disabling OpenMP. See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91920
diff --git a/sources b/sources index 6ad0b75..7a82fb1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (darktable-2.6.3.tar.xz) = 4672f4f4d5fa57fb0d53d3886cd2773a6036334b85a0df29995f1a67c59d6b57534e06c8bf1666c8e294dd92db1197113bb3d625512671625c14e0abf5e2f14c +SHA512 (darktable-3.0.0.rc2.tar.xz) = 7a3eccfc9a19d3777c82ba2c47b7f52eddacfbfa62563dfd832851de5833bb1b20b27acc752441d2f5dcee534109a75566b0d12ce3d2935f81756a2e9412e484
arch-excludes@lists.fedoraproject.org
-
githook-noreply＠fedoraproject.org