From 5420c5d2d87538014acbc90182cf347d483319e0c2ca9a220c4b85d4c08bf5ee Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Tue, 18 Jan 2022 10:11:44 +0000
Subject: [PATCH] Spec cleanup

OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=66
---
 gmic.changes |  5 +++++
 gmic.spec    | 37 ++++++++++++++++++++-----------------
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/gmic.changes b/gmic.changes
index 9599fa0..a39f22d 100644
--- a/gmic.changes
+++ b/gmic.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jan 18 10:11:09 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Spec cleanup.
+
 -------------------------------------------------------------------
 Sun Jan 16 21:16:02 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
 
diff --git a/gmic.spec b/gmic.spec
index 255dcc2..03b2a97 100644
--- a/gmic.spec
+++ b/gmic.spec
@@ -53,19 +53,19 @@ Source0:        https://gmic.eu/files/source/gmic_%{version}.tar.gz
 Source1:        gmic_qt.png
 Source99:       series
 # PATCH-FIX-UPSTREAM gmic-make-build-without-gmic-cpp.patch - all those changes are already merged
-Patch1:         gmic-make-build-without-gmic-cpp.patch
+Patch0:         gmic-make-build-without-gmic-cpp.patch
 # PATCH-FIX-UPSTREAM gmic-qt-make-it-work-without-gmic-cpp.patch - https://github.com/c-koi/gmic-qt/pull/134
-Patch2:         gmic-qt-make-it-work-without-gmic-cpp.patch
+Patch1:         gmic-qt-make-it-work-without-gmic-cpp.patch
 # PATCH-FIX-UPSTREAM krita.patch - Will be sent upstream soon. For now https://github.com/darix/gmic-qt/tree/krita5
-Patch3:         krita5.patch
+Patch2:         krita5.patch
 # PATCH-FIX-UPSTREAM 56f7340ecb1fbbe6fce87d0a5c8d35dd13359577.patch - Already upstream
-Patch4:         https://github.com/dtschump/gmic/commit/56f7340ecb1fbbe6fce87d0a5c8d35dd13359577.patch
+Patch3:         https://github.com/dtschump/gmic/commit/56f7340ecb1fbbe6fce87d0a5c8d35dd13359577.patch
 BuildRequires:  cmake >= 3.14.0
 BuildRequires:  fftw3-threads-devel
 #
 # BR for pkg_vcmp
 #
-# Those 2 are used for the pkg_vcmp conditionals above and also the rich expressions in the BuildRequiresb below
+# Those 2 are used for the pkg_vcmp conditionals above and also the rich expressions in the BuildRequires below
 #
 BuildRequires:  gimp
 BuildRequires:  krita
@@ -74,9 +74,11 @@ BuildRequires:  krita
 #
 BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
+BuildRequires:  xorg-x11-devel
 BuildRequires:  (krita-devel if krita >= 5)
 BuildRequires:  (pkgconfig(gimp-2.0) if gimp < 2.99)
 BuildRequires:  (pkgconfig(gimp-3.0) if gimp >= 2.99)
+BuildRequires:  cmake(KF5CoreAddons)
 BuildRequires:  cmake(Qt5Core)
 BuildRequires:  cmake(Qt5Gui)
 BuildRequires:  cmake(Qt5LinguistTools)
@@ -104,7 +106,6 @@ BuildRequires:  pkgconfig(opencv4)
 BuildRequires:  pkgconfig(zlib)
 %endif
 %endif
-BuildRequires:  xorg-x11-devel
 Requires:       gmic-data = %{version}
 
 %description
@@ -136,11 +137,11 @@ uses the gmic functionality provided by the gmic library.
 Summary:        GMIC plugin for gimp
 License:        GPL-3.0-or-later
 Group:          Productivity/Graphics/Bitmap Editors
+Requires:       gmic-data = %{version}
 %requires_eq    gimp
 # This package was only available in the 'graphics' repo
 Provides:       gmic-gimp = %{version}
 Obsoletes:      gmic-gimp < %{version}
-Requires:       gmic-data = %{version}
 
 %description -n gimp-plugin-gmic
 This is a plugin for gimp that exposes many of the nice gmic features
@@ -150,8 +151,8 @@ for interactive use in gimp.
 Summary:        GMIC plugin for krita
 License:        GPL-3.0-or-later
 Group:          Productivity/Graphics/Bitmap Editors
-%requires_eq    krita
 Requires:       gmic-data = %{version}
+%requires_eq    krita
 
 %description -n  krita-plugin-gmic
 This is a plugin for krita to provide gmic features.
@@ -178,12 +179,12 @@ This package contains shared data files for the various gmic frontends.
 
 %prep
 %setup -q
-%patch1 -p1
+%patch0 -p1
 pushd gmic-qt
+%patch1 -p1
 %patch2 -p1
-%patch3 -p1
 popd
-%patch4 -p1
+%patch3 -p1
 
 %build
 # Build gmic
@@ -212,9 +213,11 @@ cd ..
 done
 
 %if %{with krita5}
-
 %cmake_kf5 -d plugin-build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} %{gmic_qt_options} -DGMIC_QT_HOST=krita-plugin -DCMAKE_BUILD_TYPE=RelWithDebInfo
-%make_jobs
+
+pushd plugin-build
+%cmake_build
+popd
 
 cd ..
 %endif
@@ -225,7 +228,7 @@ popd
 
 %if %{with krita5}
 pushd gmic-qt/plugin-build
-%make_install
+%cmake_install
 popd
 %else
 # krita plugin
@@ -242,7 +245,7 @@ install -d -m 0755 \
     %{buildroot}%{gmic_datadir}/
 
 for file in gmic_cluts.gmz gmic_denoise_cnn.gmz ; do
-    install -m 0644 resources/${file}      %{buildroot}%{gmic_datadir}/${file}
+    install -m 0644 resources/${file} %{buildroot}%{gmic_datadir}/${file}
 done
 
 # qt_gmic
@@ -267,7 +270,7 @@ popd
 
 %files data
 %license COPYING
-%{gmic_datadir}
+%{gmic_datadir}/
 
 %files -n gimp-plugin-gmic
 %license COPYING
@@ -276,7 +279,7 @@ popd
 %files -n krita-plugin-gmic
 %license COPYING
 %if %{with krita5}
-%{_libdir}/kritaplugins/krita_gmic_qt.so
+%{_kf5_libdir}/kritaplugins/krita_gmic_qt.so
 %else
 %{_bindir}/gmic_krita_qt
 %endif