diff --git a/srcpkgs/ConsoleKit/ConsoleKit.rshlibs b/srcpkgs/ConsoleKit/ConsoleKit.rshlibs index df40720920c..66ab438891a 100644 --- a/srcpkgs/ConsoleKit/ConsoleKit.rshlibs +++ b/srcpkgs/ConsoleKit/ConsoleKit.rshlibs @@ -6,5 +6,4 @@ libgobject-2.0.so.0 libglib-2.0.so.0 libc.so.6 libz.so.1 -librt.so.1 libpam.so.0 diff --git a/srcpkgs/ConsoleKit/patches/switch-to-run.patch b/srcpkgs/ConsoleKit/patches/switch-to-run.patch new file mode 100644 index 00000000000..705d71920f2 --- /dev/null +++ b/srcpkgs/ConsoleKit/patches/switch-to-run.patch @@ -0,0 +1,27 @@ +--- src/ck-manager.c.orig 2012-07-09 12:38:27.749426822 +0200 ++++ src/ck-manager.c 2012-07-09 12:39:08.292465239 +0200 +@@ -181,8 +181,8 @@ ck_manager_dump (CkManager *manager) + { + int fd; + int res; +- const char *filename = LOCALSTATEDIR "/run/ConsoleKit/database"; +- const char *filename_tmp = LOCALSTATEDIR "/run/ConsoleKit/database~"; ++ const char *filename = "/run/ConsoleKit/database"; ++ const char *filename_tmp = "/run/ConsoleKit/database~"; + + if (manager == NULL) { + return; +@@ -190,11 +190,11 @@ ck_manager_dump (CkManager *manager) + + /* always make sure we have a directory */ + errno = 0; +- res = g_mkdir_with_parents (LOCALSTATEDIR "/run/ConsoleKit", ++ res = g_mkdir_with_parents ("/run/ConsoleKit", + S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH); + if (res < 0) { + g_warning ("Unable to create directory %s (%s)", +- LOCALSTATEDIR "/run/ConsoleKit", ++ "/run/ConsoleKit", + g_strerror (errno)); + return; + } diff --git a/srcpkgs/ConsoleKit/template b/srcpkgs/ConsoleKit/template index 266ed99dbb1..bc44f0a4794 100644 --- a/srcpkgs/ConsoleKit/template +++ b/srcpkgs/ConsoleKit/template @@ -1,11 +1,12 @@ # Template file for 'ConsoleKit' pkgname=ConsoleKit version=0.4.5 -revision=7 +revision=8 distfiles="http://www.freedesktop.org/software/$pkgname/dist/$pkgname-$version.tar.bz2" build_style=gnu-configure configure_args="--enable-docbook-docs --enable-pam-module ---with-systemdsystemunitdir=/lib/systemd/system" +--with-systemdsystemunitdir=/lib/systemd/system +--with-pid-file=/run/ConsoleKit/pid" makedepends="pkg-config xmlto libX11-devel dbus-devel glib-devel dbus-glib-devel pam-devel polkit-devel zlib-devel" short_desc="Framework for defining and tracking users, login sessions and seats" maintainer="Juan RP " @@ -23,10 +24,7 @@ conf_files="/etc/logrotate.d/ConsoleKit" subpackages="$pkgname-devel $pkgname-x11" make_dirs="/var/log/${pkgname} 0755 root root" - - -post_install() -{ +post_install() { vinstall ${FILESDIR}/pam-foreground-compat.ck 755 \ usr/lib/${pkgname}/run-session.d for f in seat session; do