From e8b2ee2e4853973d17f91d816afd6d57da6c706b Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 26 Oct 2010 13:34:05 +0200
Subject: [PATCH] ConsoleKit: update to 0.4.2.

---
 srcpkgs/ConsoleKit/ConsoleKit-devel.template  |  2 -
 srcpkgs/ConsoleKit/ConsoleKit-x11.template    |  2 -
 srcpkgs/ConsoleKit/files/ck.logrotate         |  5 +++
 .../patches/reorder-initialization.patch      | 41 -------------------
 srcpkgs/ConsoleKit/template                   | 11 +++--
 5 files changed, 12 insertions(+), 49 deletions(-)
 create mode 100644 srcpkgs/ConsoleKit/files/ck.logrotate
 delete mode 100644 srcpkgs/ConsoleKit/patches/reorder-initialization.patch

diff --git a/srcpkgs/ConsoleKit/ConsoleKit-devel.template b/srcpkgs/ConsoleKit/ConsoleKit-devel.template
index ed35cf4f805..43c6fbb29fe 100644
--- a/srcpkgs/ConsoleKit/ConsoleKit-devel.template
+++ b/srcpkgs/ConsoleKit/ConsoleKit-devel.template
@@ -5,8 +5,6 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=2
-
 Add_dependency run libX11-devel
 Add_dependency run dbus-devel
 Add_dependency run glib-devel
diff --git a/srcpkgs/ConsoleKit/ConsoleKit-x11.template b/srcpkgs/ConsoleKit/ConsoleKit-x11.template
index 25a4d28868e..3c213be400d 100644
--- a/srcpkgs/ConsoleKit/ConsoleKit-x11.template
+++ b/srcpkgs/ConsoleKit/ConsoleKit-x11.template
@@ -5,8 +5,6 @@ long_desc="${long_desc}
 
  This package contains some tools that require X libraries."
 
-revision=2
-
 Add_dependency run glibc
 Add_dependency run glib
 Add_dependency run libX11
diff --git a/srcpkgs/ConsoleKit/files/ck.logrotate b/srcpkgs/ConsoleKit/files/ck.logrotate
new file mode 100644
index 00000000000..7c5346ef839
--- /dev/null
+++ b/srcpkgs/ConsoleKit/files/ck.logrotate
@@ -0,0 +1,5 @@
+/var/log/ConsoleKit/history {
+    missingok
+    notifempty
+    delaycompress
+}
diff --git a/srcpkgs/ConsoleKit/patches/reorder-initialization.patch b/srcpkgs/ConsoleKit/patches/reorder-initialization.patch
deleted file mode 100644
index 7d349504727..00000000000
--- a/srcpkgs/ConsoleKit/patches/reorder-initialization.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Fixes initialization with hal-0.5.14 through dbus, from Archlinux.
-
---- src/main.c.reorder-initialization	2009-12-18 14:51:38.821212946 -0500
-+++ src/main.c	2009-12-18 14:52:19.246211176 -0500
-@@ -294,11 +294,19 @@ main (int    argc,
- 
-         setup_debug_log (debug);
- 
-+        g_debug ("initializing console-kit-daemon %s", VERSION);
-+
-         connection = get_system_bus ();
-         if (connection == NULL) {
-                 goto out;
-         }
- 
-+        manager = ck_manager_new ();
-+
-+        if (manager == NULL) {
-+                goto out;
-+        }
-+
-         bus_proxy = get_bus_proxy (connection);
-         if (bus_proxy == NULL) {
-                 g_warning ("Could not construct bus_proxy object; bailing out");
-@@ -310,16 +318,8 @@ main (int    argc,
-                 goto out;
-         }
- 
--        g_debug ("initializing console-kit-daemon %s", VERSION);
--
-         create_pid_file ();
- 
--        manager = ck_manager_new ();
--
--        if (manager == NULL) {
--                goto out;
--        }
--
-         loop = g_main_loop_new (NULL, FALSE);
- 
-         g_signal_connect (bus_proxy,
diff --git a/srcpkgs/ConsoleKit/template b/srcpkgs/ConsoleKit/template
index 8530e0e3c47..c801d183336 100644
--- a/srcpkgs/ConsoleKit/template
+++ b/srcpkgs/ConsoleKit/template
@@ -1,14 +1,13 @@
 # Template file for 'ConsoleKit'
 pkgname=ConsoleKit
-version=0.4.1
-revision=4
+version=0.4.2
 distfiles="http://www.freedesktop.org/software/$pkgname/dist/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--enable-docbook-docs --enable-pam-module
 --localstatedir=/var"
 short_desc="Framework for defining and tracking users, login sessions and seats"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=f032adc6146d745034315054c5822a7a09f30e20a40d6e802221fa977354403e
+checksum=656f406c9c436bd105c34d87e824cb2fbae09fa672b93894059281124480fe15
 long_desc="
  ConsoleKit is a framework for keeping track of the various users, sessions,
  and seats present on a system. It provides a mechanism for software to react
@@ -17,7 +16,7 @@ long_desc="
 
 conf_files="
 /etc/dbus-1/system.d/ConsoleKit.conf
-/etc/ConsoleKit/seats.d/00-primary.seat"
+/etc/logrotate.d/ConsoleKit"
 
 keep_empty_dirs=yes
 subpackages="$pkgname-devel $pkgname-x11"
@@ -29,6 +28,7 @@ Add_dependency run glib
 Add_dependency run pam
 Add_dependency run polkit
 Add_dependency run zlib
+
 Add_dependency build pkg-config
 Add_dependency build xmlto
 Add_dependency build libX11-devel
@@ -45,4 +45,7 @@ post_install()
 		${DESTDIR}/usr/lib/ConsoleKit/run-session.d
 	install -d ${DESTDIR}/etc/ConsoleKit/run-seat.d
 	install -d ${DESTDIR}/etc/ConsoleKit/run-session.d
+
+	install -D -m644 ${FILESDIR}/ck.logrotate \
+		${DESTDIR}/etc/logrotate.d/ConsoleKit
 }