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