diff options
| author | root <root@rshg047.dnsready.net> | 2011-04-18 05:50:22 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-04-18 05:50:22 +0000 |
| commit | 6ca29e0c62691c1f3120dda0f6b59dbb86cc9295 (patch) | |
| tree | f5316be783bd7c6686356e0dcd4c5ed9777e1eb4 /testing/gdm | |
| parent | 049af7a95b01eba14d33586ad5852dddaf107e53 (diff) | |
Mon Apr 18 05:50:22 UTC 2011
Diffstat (limited to 'testing/gdm')
| -rw-r--r-- | testing/gdm/PKGBUILD | 5 | ||||
| -rw-r--r-- | testing/gdm/gdm.install | 21 |
2 files changed, 5 insertions, 21 deletions
diff --git a/testing/gdm/PKGBUILD b/testing/gdm/PKGBUILD index bda165c1a..2248f184d 100644 --- a/testing/gdm/PKGBUILD +++ b/testing/gdm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 118402 2011-04-06 16:14:51Z ibiru $ +# $Id: PKGBUILD 119944 2011-04-17 09:10:01Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gdm pkgver=3.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="Gnome Display Manager (a reimplementation of xdm)" arch=('i686' 'x86_64') license=('GPL') @@ -60,4 +60,5 @@ package() { rmdir "${pkgdir}/var/gdm" chmod 1770 "${pkgdir}/var/log/gdm" + rm -rf "${pkgdir}/var/run" } diff --git a/testing/gdm/gdm.install b/testing/gdm/gdm.install index c2b5e375e..6cd981d77 100644 --- a/testing/gdm/gdm.install +++ b/testing/gdm/gdm.install @@ -2,31 +2,14 @@ pkgname=gdm post_install() { getent group gdm >/dev/null 2>&1 || groupadd -g 120 gdm - if getent passwd gdm > /dev/null 2>&1; then - usr/sbin/usermod -d /var/lib/gdm -c 'Gnome Display Manager' -s /sbin/nologin gdm > /dev/null 2>&1 - else - usr/sbin/useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm - fi + getent passwd gdm > /dev/null 2>&1 || usr/sbin/useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm passwd -l gdm > /dev/null - chown gdm:gdm /var/lib/gdm > /dev/null - chown -R gdm:gdm /var/lib/gdm/.gconf.mandatory + chown -R gdm:gdm /var/lib/gdm > /dev/null gtk-update-icon-cache -q -t -f usr/share/icons/hicolor gconfpkg --install ${pkgname} } -pre_upgrade() { - if [ -f opt/gnome/etc/gdm/custom.conf ]; then - mkdir -p etc/gdm - sed -e 's|/opt/gnome/libexec|usr/lib/gdm|g' \ - -e 's|/opt/gnome/etc|/etc|g' \ - -e 's|/opt/gnome/|/usr/|g' \ - opt/gnome/etc/gdm/custom.conf > etc/gdm/custom.conf - mv opt/gnome/etc/gdm/custom.conf opt/gnome/etc/gdm/custom.conf.pacsave - fi - pre_remove -} - pre_remove() { if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then gconfpkg --uninstall ${pkgname} |