Accepting request 947181 from KDE:Extra

- 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/947181
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/krita?expand=0&rev=60

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>
 

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(Qt5Core)
 
 %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