rpms/ConsoleKit/devel nodeamon.patch, NONE, 1.1 ConsoleKit.spec, 1.50, 1.51

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/ConsoleKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5530

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/devel/ConsoleKit.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- ConsoleKit.spec	9 Dec 2009 22:25:37 -0000	1.50
+++ ConsoleKit.spec	15 Dec 2009 18:04:57 -0000	1.51
@@ -6,12 +6,16 @@
 Summary: System daemon for tracking users, sessions and seats
 Name: ConsoleKit
 Version: 0.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/wiki/Software/ConsoleKit
 Source0: http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-%{version}.tar.bz2
+# Convert to new upstart syntax
 Patch0: ConsoleKit-0.4.1-upstart06.patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=25656
+Patch1: nodaemon.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
@@ -27,6 +31,7 @@ BuildRequires: zlib-devel
 BuildRequires: xmlto
 BuildRequires: automake, autoconf, libtool
 
+
 %description
 ConsoleKit is a system daemon for tracking what users are logged
 into the system and how they interact with the computer (e.g.
@@ -81,8 +86,8 @@ This package contains developer document
 
 %prep
 %setup -q
-%patch0 -p1 
-
+%patch0 -p1 -b .upstart06
+%patch1 -p1 -b .no-daemon
 %build
 %configure --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid --enable-pam-module --with-pam-module-dir=/%{_lib}/security --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version}
 
@@ -169,6 +174,9 @@ fi
 %doc %{_datadir}/doc/%{name}-%{version}/spec/*
 
 %changelog
+* Tue Dec 15 2009 Matthias Clasen <mclasen at redhat.com> 0.4.1-3
+- Don't daemonize when activated
+
 * Wed Dec  9 2009 Bill Nottingham <notting at redhat.com> 0.4.1-2
 - Adjust for upstart 0.6