doc: Conflicts: kcm_colors < 1:4.11.16-10 (drop conflicts in main pkg)

plasma-desktop.spec

@@ -1,6 +1,6 @@
 Name:           plasma-desktop
 Version:        5.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Plasma Desktop shell
 
 License:        GPLv2+ and (GPLv2 or GPLv3)
@@ -97,8 +97,6 @@ Requires:       kwin
 
 Obsoletes:      kde-workspace < 5.0.0-1
 
-Conflicts:      kcm_colors < 4.11.16-2
-
 %description
 %{summary}.
 
@@ -107,6 +105,8 @@ Summary:        Documentation and user manuals for %{name}
 # per https://bugzilla.redhat.com/show_bug.cgi?id=1199720
 # I abhor unversioned Obsoletes, so adding one here with Epoch:1 to be on the safe side -- rex
 Obsoletes:      kde-runtime-docs < 1:14.12.3-2
+# when conflicting HTML docs were removed
+Conflicts:      kcm_colors < 1:4.11.16-10
 %description    doc
 %{summary}.
 
@@ -224,6 +224,9 @@ fi
 
 
 %changelog
+* Fri Mar 20 2015 Rex Dieter <rdieter@fedoraproject.org> 5.2.2-2
+- -doc: Conflicts: kcm_colors < 1:4.11.16-10 (drop conflicts in main pkg)
+
 * Fri Mar 20 2015 Daniel Vrátil <dvratil@redhat.com> - 5.2.2-1
 - Plasma 5.2.2