[ConsoleKit/f14/master] New upstream release

[Lennart Poettering]

commit 71c6e8f46527fcbbcc5a1fb44307a92516604ff6
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Sep 6 19:06:26 2010 +0200

    New upstream release

 .gitignore      |    1 +
 ConsoleKit.spec |   20 +++++++++++++-------
 sources         |    2 +-
 3 files changed, 15 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ce0a701..cb8d22f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 ConsoleKit-0.4.1.tar.bz2
+/ConsoleKit-0.4.2.tar.bz2
diff --git a/ConsoleKit.spec b/ConsoleKit.spec
index 86b9bfe..6f2c3dc 100644
--- a/ConsoleKit.spec
+++ b/ConsoleKit.spec
@@ -5,16 +5,14 @@
 
 Summary: System daemon for tracking users, sessions and seats
 Name: ConsoleKit
-Version: 0.4.1
-Release: 4%{?dist}
+Version: 0.4.2
+Release: 1%{?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}
@@ -31,7 +29,6 @@ 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.
@@ -87,7 +84,6 @@ This package contains developer documentation for ConsoleKit.
 %prep
 %setup -q
 %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}
@@ -150,6 +146,14 @@ fi
 %{_bindir}/ck-launch-session
 %{_bindir}/ck-list-sessions
 %{_prefix}/lib/ConsoleKit/scripts/*
+/lib/systemd/system/console-kit-daemon.service
+/lib/systemd/system/console-kit-log-system-start.service
+/lib/systemd/system/console-kit-log-system-stop.service
+/lib/systemd/system/console-kit-log-system-restart.service
+/lib/systemd/system/basic.target.wants/console-kit-log-system-start.service
+/lib/systemd/system/halt.target.wants/console-kit-log-system-stop.service
+/lib/systemd/system/poweroff.target.wants/console-kit-log-system-stop.service
+/lib/systemd/system/reboot.target.wants/console-kit-log-system-restart.service
 
 %files x11
 %defattr(-,root,root,-)
@@ -175,6 +179,9 @@ fi
 %doc %{_datadir}/doc/%{name}-%{version}/spec/*
 
 %changelog
+* Fri Sep  3 2010 Lennart Poettering <lpoetter at redhat.com> - 0.4.2-1
+- New upstream release
+
 * Wed Jan 20 2010 Ray Strode <rstrode at redhat.com> 0.4.1-4
 - Register object methods with dbus-glib before taking bus name
   (fix 545267)
@@ -344,4 +351,3 @@ fi
 
 * Mon Oct 23 2006 David Zeuthen <davidz at redhat.com> - 0.0.3-1
 - Initial build.
-
diff --git a/sources b/sources
index f569f9c..848d130 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-48eda4483cc97841d5f88e8e003eb6d7  ConsoleKit-0.4.1.tar.bz2
+285acb35bfcb2b8dc21c6071e6f6e116  ConsoleKit-0.4.2.tar.bz2