[kdebase-workspace/f15] lightdm integration breaks gdm integration (kde#278206)

Rex Dieter rdieter at fedoraproject.org
Fri Aug 12 16:55:50 UTC 2011


commit 23df18d3f98ae294b6abdb091bafa4036011226f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Aug 12 11:55:36 2011 -0500

    lightdm integration breaks gdm integration (kde#278206)

 kdebase-workspace.spec |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index f83e4f8..8e61e6b 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: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -68,6 +68,10 @@ Patch24: kdebase-workspace-4.6.3-multilib_qt_plugin_path.patch
 # "keyboard stops working", https://bugs.kde.org/show_bug.cgi?id=171685#c135
 Patch50: kdebase-workspace-4.3.3-kde#171685.patch
 
+# fix for "lightdm integration breaks gdm integration" (4.7 regression)
+# https://bugs.kde.org/show_bug.cgi?id=278206 (patch by Alex Fiestas)
+Patch51: kdebase-workspace-4.7.0-kde#278206.patch
+
 ## 4.6 patches
 # [Bug 718461] New: After unplugging external monitor laptop left with black screen
 Patch100: kdebase-workspace-4.6.6-bug718461.patch
@@ -318,6 +322,7 @@ Requires: akonadi
 
 # upstreamable patches
 %patch50 -p1 -b .kde#171685
+%patch51 -p1 -b .kde#278206
 
 # 4.6 patches
 %patch100 -p1 -b .bug718461
@@ -744,6 +749,9 @@ fi
 
 
 %changelog
+* Fri Aug 12 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.5-5
+- lightdm integration breaks gdm integration (kde#278206)
+
 * Mon Jul 18 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.5-4
 - Conflicts: kdm < 4.6.5-2 (when kgreet_* plugins moved)
 


More information about the scm-commits mailing list