From ab84faea9c2735b7d0b5cd6087b25586df019c40b0757308941d79b36c02b39f Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Tue, 18 Jan 2022 09:43:35 +0000
Subject: [PATCH 1/2] Accepting request 946475 from home:darix:playground

- convert the conflicts to recommends as we now have a working
  krita-plugin-gmic package again

- Actually install the devel files as we need them for gmic

OBS-URL: https://build.opensuse.org/request/show/946475
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=159
---
 krita.changes | 11 +++++++++++
 krita.spec    | 12 +++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/krita.changes b/krita.changes
index 97ae3bd..59efd0a 100644
--- a/krita.changes
+++ b/krita.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Jan 14 15:55:53 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
+
+- convert the conflicts to recommends as we now have a working
+  krita-plugin-gmic package again
+
+-------------------------------------------------------------------
+Fri Jan 14 14:12:12 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
+
+- Actually install the devel files as we need them for gmic
+
 -------------------------------------------------------------------
 Fri Jan  7 08:11:30 UTC 2022 - Wolfgang Bauer <wbauer@tmo.at>
 
diff --git a/krita.spec b/krita.spec
index 7b1f62a..681d712 100644
--- a/krita.spec
+++ b/krita.spec
@@ -98,8 +98,7 @@ Provides:       calligra-krita = %{version}
 %if %{with vc}
 BuildRequires:  Vc-devel-static
 %endif
-# it has an intree copy now and no longer works with the external copy
-Conflicts:      krita-plugin-gmic
+Recommends:     krita-plugin-gmic
 
 %description
 Krita is a painting program. It supports concept art, texture and
@@ -109,6 +108,7 @@ matte painters, as well as illustrations and comics.
 Summary:        Krita Build Environment
 Group:          Development/Libraries/KDE
 Requires:       %{name} = %{version}
+Requires:       cmake(KF5CoreAddons)
 
 %description devel
 Development headers and libraries for Krita.
@@ -140,11 +140,6 @@ chmod -x %{buildroot}%{_kf5_applicationsdir}/*.desktop
 # remove shebang to avoid rpmlint warning, that file is not supposed to be run directly anyway
 sed -i "/#!\/usr\/bin\/env/d" %{buildroot}%{_kf5_libdir}/krita-python-libs/krita/sceditor/highlighter.py
 
-rm \
-  %{buildroot}%{_includedir}/kis_qmic_interface.h \
-  %{buildroot}%{_includedir}/kis_qmic_plugin_interface.h \
-  %{buildroot}%{_includedir}/kritaqmicinterface_export.h
-
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
@@ -179,6 +174,9 @@ rm \
 
 %files devel
 %{_kf5_libdir}/libkrita*.so
+%{_includedir}/kis_qmic_interface.h
+%{_includedir}/kis_qmic_plugin_interface.h
+%{_includedir}/kritaqmicinterface_export.h
 
 %if %{with released}
 %files lang -f %{name}.lang

From 24c76ff13e1c2df2ff42cdbd7b8c78060e3d00af1fe4182ae3319b415a7e889d Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Tue, 18 Jan 2022 09:44:15 +0000
Subject: [PATCH 2/2] fixup

OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=160
---
 krita.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/krita.spec b/krita.spec
index 681d712..a554f6f 100644
--- a/krita.spec
+++ b/krita.spec
@@ -108,7 +108,7 @@ matte painters, as well as illustrations and comics.
 Summary:        Krita Build Environment
 Group:          Development/Libraries/KDE
 Requires:       %{name} = %{version}
-Requires:       cmake(KF5CoreAddons)
+Requires:       cmake(Qt5Core)
 
 %description devel
 Development headers and libraries for Krita.