From 2791a1c36f0c3407ace536e16831687b3f05ebef Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 6 Nov 2010 04:54:30 +0100 Subject: [PATCH] gdm: remove /var/log/gdm at deinstall time, fix at-spi-registryd init. Bumprev. --- srcpkgs/gdm/REMOVE | 3 +++ srcpkgs/gdm/template | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gdm/REMOVE b/srcpkgs/gdm/REMOVE index a24cd8bb73..1aeccc1025 100644 --- a/srcpkgs/gdm/REMOVE +++ b/srcpkgs/gdm/REMOVE @@ -6,5 +6,8 @@ post) if [ -d var/lib/gdm ]; then rm -rf var/lib/gdm fi + if [ -d var/log/gdm ]; then + rm -rf var/log/gdm + fi ;; esac diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index b7b2384bd7..4323be68dd 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,14 +1,14 @@ # Template file for 'gdm' pkgname=gdm version=2.32.0 -revision=1 +revision=3 distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--disable-schemas-install --disable-scrollkeeper --with-gconf-schema-file-dir=/usr/share/gconf/schemas --localstatedir=/var --enable-console-helper --enable-authentication-scheme=pam --enable-ipv6 ---with-user=gdm --with-group=gdm --with-xevie" +--with-user=gdm --with-group=gdm --with-xevie --exec-prefix=/usr" short_desc="GNOME Display Manager" maintainer="Juan RP " checksum=f47acd19ed10d6fbb37c3e2b54f5b392c7020db67f71db3f75567ead30ab2fa4 @@ -98,6 +98,7 @@ Add_dependency build libxml2-devel Add_dependency build upower-devel Add_dependency build libcanberra-devel Add_dependency build tcp_wrappers-devel +Add_dependency build at-spi Add_dependency full ConsoleKit-x11 Add_dependency full xorg-server @@ -113,4 +114,8 @@ post_install() ${DESTDIR}/etc/pam.d/gdm-autologin # Install OpenRC service. install -D -m755 ${FILESDIR}/gdm.rc ${DESTDIR}/etc/init.d/gdm + + # Transform ${exec_prefix} to start at-spi-registryd! + sed -i -e "s|\${exec_prefix}|/usr|" \ + ${DESTDIR}//usr/share/gdm/autostart/LoginWindow/at-spi-registryd-wrapper.desktop }