Accepting request 950368 from graphics:darktable
Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/950368 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/darktable?expand=0&rev=98
This commit is contained in:
commit
7c1a8b3712
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jan 25 08:46:58 UTC 2022 - Dan Čermák <dcermak@suse.com>
|
||||||
|
|
||||||
|
- Switch from %fedora_version to %fedora
|
||||||
|
%fedora_version is not defined on Fedora systems, the correct macro to use is
|
||||||
|
%fedora
|
||||||
|
- drop version checks for EOL'd Fedora versions (oldest supported Fedora is 34)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sat Jan 8 15:46:14 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
|
Sat Jan 8 15:46:14 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
%bcond_with clang
|
%bcond_with clang
|
||||||
|
|
||||||
%if 0%{?fedora_version} >= 33 || 0%{?suse_version} >= 1590
|
%if 0%{?fedora} || 0%{?suse_version} >= 1590
|
||||||
%bcond_with use_intree_lua
|
%bcond_with use_intree_lua
|
||||||
%else
|
%else
|
||||||
%bcond_without use_intree_lua
|
%bcond_without use_intree_lua
|
||||||
@ -30,19 +30,19 @@
|
|||||||
%define _dont_use_intree_lua ON
|
%define _dont_use_intree_lua ON
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?suse_version} || 0%{?fedora_version} >= 33
|
%if 0%{?suse_version} || 0%{?fedora}
|
||||||
%bcond_without cmake_macros
|
%bcond_without cmake_macros
|
||||||
%else
|
%else
|
||||||
%bcond_with cmake_macros
|
%bcond_with cmake_macros
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?suse_version} || 0%{?fedora_version} >= 33
|
%if 0%{?suse_version} || 0%{?fedora}
|
||||||
%bcond_without cmake_macros
|
%bcond_without cmake_macros
|
||||||
%else
|
%else
|
||||||
%bcond_with cmake_macros
|
%bcond_with cmake_macros
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?is_opensuse} || 0%{?fedora_version} >= 26
|
%if 0%{?is_opensuse} || 0%{?fedora}
|
||||||
%bcond_without osmgpsmap
|
%bcond_without osmgpsmap
|
||||||
%bcond_without flickcurl
|
%bcond_without flickcurl
|
||||||
%bcond_without translated_manpages
|
%bcond_without translated_manpages
|
||||||
@ -52,7 +52,7 @@
|
|||||||
%bcond_with translated_manpages
|
%bcond_with translated_manpages
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?suse_version} >= 1550 || 0%{?fedora_version} >= 33
|
%if 0%{?suse_version} >= 1550 || 0%{?fedora}
|
||||||
%bcond_without avif
|
%bcond_without avif
|
||||||
%else
|
%else
|
||||||
%bcond_with avif
|
%bcond_with avif
|
||||||
@ -125,7 +125,7 @@ BuildRequires: clang
|
|||||||
BuildRequires: cmake >= 3.4
|
BuildRequires: cmake >= 3.4
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: llvm-devel
|
BuildRequires: llvm-devel
|
||||||
%if 0%{?fedora_version}
|
%if 0%{?fedora}
|
||||||
BuildRequires: llvm-static
|
BuildRequires: llvm-static
|
||||||
%endif
|
%endif
|
||||||
%if %{without clang}
|
%if %{without clang}
|
||||||
@ -156,11 +156,7 @@ BuildRequires: pkgconfig(lua5.4)
|
|||||||
%else
|
%else
|
||||||
BuildRequires: pkgconfig(lua)
|
BuildRequires: pkgconfig(lua)
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?fedora_version} == 31
|
|
||||||
BuildRequires: pugixml-devel
|
|
||||||
%else
|
|
||||||
BuildRequires: pkgconfig(pugixml)
|
BuildRequires: pkgconfig(pugixml)
|
||||||
%endif
|
|
||||||
#
|
#
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: pkgconfig(GraphicsMagick)
|
BuildRequires: pkgconfig(GraphicsMagick)
|
||||||
@ -214,7 +210,7 @@ Requires: iso-codes
|
|||||||
#
|
#
|
||||||
# Some CSS themes suggest to use the the Roboto font family
|
# Some CSS themes suggest to use the the Roboto font family
|
||||||
# https://github.com/darktable-org/darktable/releases/tag/release-3.0.0
|
# https://github.com/darktable-org/darktable/releases/tag/release-3.0.0
|
||||||
%if 0%{?fedora_version}
|
%if 0%{?fedora}
|
||||||
Recommends: roboto-fontface-fonts
|
Recommends: roboto-fontface-fonts
|
||||||
%else
|
%else
|
||||||
Recommends: google-roboto-fonts
|
Recommends: google-roboto-fonts
|
||||||
|
Loading…
Reference in New Issue
Block a user