diff --git a/krita.spec b/krita.spec index 2798846..6cfa8e1 100644 --- a/krita.spec +++ b/krita.spec @@ -1,13 +1,20 @@ %global krita_python 1 +%global kf5_ver 5.7 +%global versiondir %(echo %{version} | cut -d. -f1-3) + +# Work around for eigen3 trying to enforce power10. +# https://bugzilla.redhat.com/show_bug.cgi?id=1996330 +%ifarch ppc64 ppc64le +%global optflags %(echo %{optflags} -DEIGEN_ALTIVEC_DISABLE_MMA) +%endif Name: krita Version: 4.4.8 Release: 1%{?dist} + Summary: Krita is a sketching and painting program License: GPLv2+ URL: https://krita.org -%global versiondir %(echo %{version} | cut -d. -f1-3) -#global versiondir %{version} Source0: https://download.kde.org/%{?pre:un}stable/krita/%{versiondir}%{?pre:-%{pre}}/krita-%{version}%{?pre:-%{pre}}.tar.xz ## downstream patches @@ -15,8 +22,7 @@ Source0: https://download.kde.org/%{?pre:un}stable/krita/%{versiondir}%{? ## upstream patches Patch4523: 4523-Support-building-with-OpenEXR-3.patch -%global kf5_ver 5.7 -BuildRequires: extra-cmake-modules >= 5.7 +BuildRequires: extra-cmake-modules >= %{kf5_ver} BuildRequires: kf5-rpm-macros BuildRequires: cmake(KF5Archive) BuildRequires: cmake(KF5Completion) @@ -45,6 +51,7 @@ BuildRequires: giflib-devel >= 5 BuildConflicts: giflib-devel < 5 %endif BuildRequires: libtiff-devel +BuildRequires: ninja-build BuildRequires: pkgconfig(fftw3) BuildRequires: pkgconfig(eigen3) BuildRequires: pkgconfig(exiv2) @@ -91,7 +98,8 @@ It was created with the following types of art in mind: Summary: Shared libraries for %{name} Obsoletes: calligra-krita-libs < 3.0 Provides: calligra-krita-libs = %{version}-%{release} -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} + %description libs %{summary}. @@ -101,13 +109,7 @@ Requires: %{name} = %{version}-%{release} %build -# Work around for eigen3 trying to enforce power10. -# https://bugzilla.redhat.com/show_bug.cgi?id=1996330 -%ifarch ppc64 ppc64le -%global optflags_orig %optflags -%global optflags %optflags_orig -DEIGEN_ALTIVEC_DISABLE_MMA -%endif -%cmake_kf5 +%cmake_kf5 -G Ninja %cmake_build @@ -140,7 +142,6 @@ Requires: %{name} = %{version}-%{release} %{_kf5_libdir}/krita-python-libs/ %endif -%ldconfig_scriptlets libs %files libs %{_kf5_libdir}/libkrita*.so.* @@ -151,6 +152,7 @@ Requires: %{name} = %{version}-%{release} %changelog * Sun Sep 26 2021 Vitaly Zaitsev - 4.4.8-1 - Updated to version 4.4.8. +- Performed minor SPEC cleanup. * Mon Aug 23 2021 Richard Shaw - 4.4.5-10 - Rebuild with opencolorio1 compat package.