[kdebase-workspace/f15] Conflicts: kdm < 4.6.5-2 (when kgreet_* plugins moved)

[Rex Dieter]

commit 1852cf56a18997f21ed174d12bc6f8d564655ea6
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Jul 18 08:44:19 2011 -0500

    Conflicts: kdm < 4.6.5-2 (when kgreet_* plugins moved)

 kdebase-workspace.spec |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index 445b6d5..f83e4f8 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -8,7 +8,7 @@ Version: 4.6.5
 # for .0 releases we have to use '00' as '0' is treated as null by cmake, dont' forget to update
 %define kde4workspace_version %{version} 
 
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -88,6 +88,8 @@ Obsoletes: kdebase-workspace < 4.6.3-5
 
 # kinfocenter moved kdebase-4.4 -> kdebase-workspace-4.5
 Conflicts: kdebase < 6:4.4.80
+# kgreet_* plugins moved here
+Conflicts: kdm < 4.6.5-2
 
 Requires: polkit-kde
 
@@ -742,6 +744,9 @@ fi
 
 
 %changelog
+* Mon Jul 18 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.5-4
+- Conflicts: kdm < 4.6.5-2 (when kgreet_* plugins moved)
+
 * Tue Jul 12 2011 Lukas Tinkl <ltinkl at redhat.com> - 4.6.5-3
 - fix #718461: after unplugging external monitor laptop left with black screen