[plasma-desktop/f22] Drop Obsoletes kcm_colors

[Daniel Vrátil]

commit 7f784c6482bb6b8b28a7cbfae384bac047ed6000
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Fri Mar 6 19:52:13 2015 +0100

    Drop Obsoletes kcm_colors
    
    kcm_colors (KDE 4 version) is now co-installable, and required by some
    KDE 4 apps (digikam)

 plasma-desktop.spec | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
---
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 <dvratil at redhat.com> - 5.2.1-3
+- Does not obsolete kcm_colors anymore (KDE 4 version is co-installable now)
+
 * Fri Feb 27 2015 Daniel Vrátil <dvratil at redhat.com> - 5.2.1-2
 - Rebuild (GCC 5)