[kdebase-workspace] Conflicts: kdm < 4.6.90-4 (when kgreet_* plugins moved)

[Rex Dieter]

commit 119b141f63cf2752b7f8090283897d570c6ab1a0
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Jul 18 08:42:45 2011 -0500

    Conflicts: kdm < 4.6.90-4 (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 7c5f5c4..acf96b0 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -8,7 +8,7 @@ Version: 4.6.95
 # 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: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -83,6 +83,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.90-4
 
 Requires: polkit-kde
 
@@ -750,6 +752,9 @@ fi
 
 
 %changelog
+* Mon Jul 18 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.95-3
+- Conflicts: kdm < 4.6.90-4 (when kgreet_* plugins moved) 
+
 * Tue Jul 12 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.95-2
 - fix redhat_startkde.patch