From 0ca8a5ecc17a33fc4b169c849ac718e9de8c6efd6c43f483e71e78a7a0605999 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Wed, 21 Dec 2016 19:38:37 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=34

---
 krita.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/krita.spec b/krita.spec
index 1fcb858..7b6c2d5 100644
--- a/krita.spec
+++ b/krita.spec
@@ -115,8 +115,6 @@ Summary:        Krita Build Environment
 Group:          Development/Libraries/KDE
 Requires:       %{name} = %{version}
 Conflicts:      calligra-devel
-# /usr/lib64/libkritacolord.so is not versioned correctly, so not part of calligra-devel...
-Conflicts:      calligra-krita
 
 %description devel
 Development headers and libraries for Krita.
@@ -145,6 +143,8 @@ sed -i "s/__TIME__/\"$FAKE_TIME\"/" plugins/extensions/gmic/3rdparty/gmic/CImg.h
 %suse_update_desktop_file -r org.kde.krita      Qt KDE Graphics RasterGraphics
 
 chmod -x %{buildroot}/%{_kf5_applicationsdir}/*.desktop
+# Otherwise the devel package conflicts with calligra-krita, where it is *not* a devel file...
+rm %{buildroot}/%{_kf5_libdir}/libkritacolord.so
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig