From 599904fbed12ffb11eba615c3eda7bd55e82b281648792e25d9f63080e3eae4c Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Fri, 3 Jun 2016 03:58:31 +0000 Subject: [PATCH] Accepting request 399888 from home:wolfi323:branches:KDE:Extra - Only replace calligra-krita on Tumbleweed and Leap, not 13.2 OBS-URL: https://build.opensuse.org/request/show/399888 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=6 --- krita.changes | 5 +++++ krita.spec | 4 ++++ 2 files changed, 9 insertions(+) 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