diff --git a/krita.changes b/krita.changes index c676f0e..3db1e40 100644 --- a/krita.changes +++ b/krita.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 2 14:57:36 UTC 2016 - wbauer@tmo.at + +- Only replace calligra-krita on Tumbleweed and Leap, not 13.2 + ------------------------------------------------------------------- Thu Jun 2 10:24:37 UTC 2016 - lbeltrame@kde.org diff --git a/krita.spec b/krita.spec index 2678658..25d9614 100644 --- a/krita.spec +++ b/krita.spec @@ -88,8 +88,12 @@ BuildRequires: pkgconfig(xinerama) BuildRequires: pkgconfig(xorg-macros) >= 1.3 BuildRequires: pkgconfig(xrandr) Recommends: create-resources +%if %{suse_version} > 1320 || 0%{?is_opensuse} Obsoletes: calligra-krita < %{version} Provides: calligra-krita = %{version} +%else +Conflicts: calligra-krita +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description