diff --git a/plasma-desktop.spec b/plasma-desktop.spec index 1a41c5b..eddad53 100644 --- a/plasma-desktop.spec +++ b/plasma-desktop.spec @@ -1,6 +1,6 @@ Name: plasma-desktop Version: 5.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Plasma Desktop shell License: GPLv2+ and (GPLv2 or GPLv3) @@ -87,9 +87,7 @@ Requires: kwin Obsoletes: kde-workspace < 5.0.0-1 -Obsoletes: kcm_colors < 5.0.0-1 -Provides: kcm_colors = %{version}-%{release} - +Conflicts: kcm_colors < 4.11.16-2 %description %{summary}. @@ -207,6 +205,9 @@ fi %changelog +* Fri Mar 06 2015 Daniel Vrátil - 5.2.1-3 +- Does not obsolete kcm_colors anymore (KDE 4 version is co-installable now) + * Fri Feb 27 2015 Daniel Vrátil - 5.2.1-2 - Rebuild (GCC 5)