rpms/kdebase/devel kdebase-3.5.6-consolekit-kdm.patch, 1.1, 1.2 kdebase.spec, 1.244, 1.245

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31723

Modified Files:
	kdebase-3.5.6-consolekit-kdm.patch kdebase.spec 
Log Message:
apply patch KDM to support ConsoleKit


kdebase-3.5.6-consolekit-kdm.patch:
 backend/Imakefile    |    4 
 backend/Makefile.am  |    5 
 backend/Makefile.in  |   13 -
 backend/client.c     |   14 +
 backend/consolekit.c |  552 +++++++++++++++++++++++++++++++++++++++++++++++++++
 backend/consolekit.h |   36 +++
 backend/dm.h         |    6 
 backend/session.c    |   20 +
 configure.in.in      |   47 ++++
 9 files changed, 688 insertions(+), 9 deletions(-)

Index: kdebase-3.5.6-consolekit-kdm.patch
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase-3.5.6-consolekit-kdm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-3.5.6-consolekit-kdm.patch	23 Apr 2007 12:00:08 -0000	1.1
+++ kdebase-3.5.6-consolekit-kdm.patch	30 Apr 2007 10:21:09 -0000	1.2
@@ -768,7 +768,7 @@
  $(srcdir)/policy.c: ../config.ci 
 diff -Nur kdebase-3.5.6/kdm/backend/session.c kdebase-3.5.6-consolekit/kdm/backend/session.c
 --- kdebase-3.5.6/kdm/backend/session.c	2006-01-19 18:03:14.000000000 +0100
-+++ kdebase-3.5.6-consolekit/kdm/backend/session.c	2007-04-18 00:35:14.000000000 +0200
++++ kdebase-3.5.6-consolekit/kdm/backend/session.c	2007-04-28 15:57:00.000000000 +0200
 @@ -45,6 +45,10 @@
  #include <ctype.h>
  #include <signal.h>
@@ -795,7 +795,7 @@
  		SetupDisplay( td_setup );
  
 +#ifdef WITH_CONSOLE_KIT
-+	ck_session_cookie = open_ck_session (getpwnam(d->userName), d);
++	ck_session_cookie = open_ck_session (getpwnam(curuser), d);
 +	if (!(clientPid = StartClient(ck_session_cookie))) {
 +#else
  	if (!(clientPid = StartClient())) {


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- kdebase.spec	23 Apr 2007 12:00:08 -0000	1.244
+++ kdebase.spec	30 Apr 2007 10:21:09 -0000	1.245
@@ -555,7 +555,8 @@
 
 %changelog
 * Mon Apr 23 2007 Than Ngo <than at redhat.com> - 6:3.5.6-6.fc7
-- apply patch KDM to support ConsoleKit, thanks to Kevin Kofler, #228111
+- apply patch KDM to support ConsoleKit, thanks to Kevin Kofler and
+  S.Çağlar Onur, #228111
 
 * Tue Apr 10 2007 Than Ngo <than at redhat.com> 6:3.5.6-5.fc7
 - fix unknown protocol smb