dvratil pushed to plasma-desktop (copr). "doc: Conflicts: kcm_colors < 1:4.11.16-10 (drop conflicts in main pkg)"

[notifications at fedoraproject.org]

>From 9cb0eca8e64abc38c9ad8dfaea250478b20d9f70 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Fri, 20 Mar 2015 09:26:08 -0500
Subject: doc: Conflicts: kcm_colors < 1:4.11.16-10 (drop conflicts in main
 pkg)


diff --git a/plasma-desktop.spec b/plasma-desktop.spec
index 81a6455..67c521b 100644
--- a/plasma-desktop.spec
+++ b/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 at 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 at redhat.com> - 5.2.2-1
 - Plasma 5.2.2
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/plasma-desktop.git/commit/?h=copr&id=9cb0eca8e64abc38c9ad8dfaea250478b20d9f70