From 3df6cebd52e55ba9f09ad824c202bc6d5fe1c8b5 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 9 Nov 2011 17:45:30 +0100 Subject: [PATCH] gdm: use make_dirs. --- srcpkgs/gdm/INSTALL | 5 ----- srcpkgs/gdm/template | 12 +++++++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/srcpkgs/gdm/INSTALL b/srcpkgs/gdm/INSTALL index 5dcca237843..b196afd09c2 100644 --- a/srcpkgs/gdm/INSTALL +++ b/srcpkgs/gdm/INSTALL @@ -3,11 +3,6 @@ # case "${ACTION}" in post) - if [ ! -d var/log/gdm ]; then - mkdir -p var/log/gdm - chown root:gdm var/log/gdm - fi - [ ! -d var/cache/gdm ] && mkdir -p var/cache/gdm chown gdm:gdm var/lib/gdm > /dev/null chown -R gdm:gdm var/lib/gdm/.gconf.mandatory dconf update diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index b1cb24cf61d..90657946eec 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,7 +1,7 @@ # Template file for 'gdm' pkgname=gdm version=3.2.1.1 -revision=1 +revision=2 distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz" build_style=gnu-configure configure_args="--disable-schemas-install --disable-scrollkeeper @@ -36,7 +36,14 @@ conf_files=" /etc/pam.d/gdm-smartcard /etc/pam.d/gdm-welcome" -keep_empty_dirs=yes +# Required runtime directories. +make_dirs=" +/var/cache/gdm 1755 root gdm +/var/log/gdm 1755 root gdm +/var/lib/gdm/.config/dconf 0755 gdm gdm +/var/lib/gdm/.local/share/applications 0755 gdm gdm +" + subpackages="gdm-devel" gconf_schemas="gdm.schemas" gtk_iconcache_dirs="/usr/share/icons/hicolor" @@ -108,7 +115,6 @@ post_install() gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \ --domain ${pkgname} ${wrksrc}/*.schemas - rm -rf ${DESTDIR}/var/run ${DESTDIR}/var/gdm chmod 1770 ${DESTDIR}/var/log/gdm chmod 700 ${DESTDIR}/var/lib/gdm/.config/dconf }