rpms/ConsoleKit/F-12 nodeamon.patch, NONE, 1.1 ConsoleKit.spec, 1.49, 1.50

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/ConsoleKit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14422

Modified Files:
	ConsoleKit.spec 
Added Files:
	nodeamon.patch 
Log Message:
Don't daemonize when activated


nodeamon.patch:
 org.freedesktop.ConsoleKit.service.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE nodeamon.patch ---
diff -up ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in.nodaemon ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in
--- ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in.nodaemon	2009-12-15 10:56:39.839818556 -0500
+++ ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in	2009-12-15 10:56:50.177792048 -0500
@@ -1,4 +1,4 @@
 [D-BUS Service]
 Name=org.freedesktop.ConsoleKit
-Exec=@sbindir@/console-kit-daemon
+Exec=@sbindir@/console-kit-daemon --no-daemon
 User=root


Index: ConsoleKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ConsoleKit/F-12/ConsoleKit.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- ConsoleKit.spec	29 Sep 2009 15:46:00 -0000	1.49
+++ ConsoleKit.spec	15 Dec 2009 16:05:02 -0000	1.50
@@ -6,7 +6,7 @@
 Summary: System daemon for tracking users, sessions and seats
 Name: ConsoleKit
 Version: 0.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/wiki/Software/ConsoleKit
@@ -25,6 +25,9 @@ BuildRequires: zlib-devel
 BuildRequires: xmlto
 BuildRequires: automake, autoconf, libtool
 
+# https://bugs.freedesktop.org/show_bug.cgi?id=25656
+Patch0: nodaemon.patch
+
 %description
 ConsoleKit is a system daemon for tracking what users are logged
 into the system and how they interact with the computer (e.g.
@@ -166,6 +169,9 @@ fi
 %doc %{_datadir}/doc/%{name}-%{version}/spec/*
 
 %changelog
+* Tue Dec 15 2009 Matthias Clasen <mclasen at redhat.com> 0.4.1-2
+- Don't daemonize when activated on the bus
+
 * Tue Sep 29 2009 Jon McCann <jmccann at redhat.com> 0.4.1-1
 - Update to 0.4.1