[arch-commits] Commit in gdm/trunk (PKGBUILD gdm.install)

[Ionut Biru]

    Date: Sunday, April 17, 2011 @ 05:10:01
  Author: ibiru
Revision: 119944

upgpkg: gdm 3.0.0-3
cleanup .install, fix ~/.config directory permission, nuke /var/run

Modified:
  gdm/trunk/PKGBUILD
  gdm/trunk/gdm.install

-------------+
 PKGBUILD    |    3 ++-
 gdm.install |   21 ++-------------------
 2 files changed, 4 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-04-17 09:04:46 UTC (rev 119943)
+++ PKGBUILD	2011-04-17 09:10:01 UTC (rev 119944)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at 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 @@
 
   rmdir "${pkgdir}/var/gdm"
   chmod 1770 "${pkgdir}/var/log/gdm"
+  rm -rf "${pkgdir}/var/run"
 }

Modified: gdm.install
===================================================================
--- gdm.install	2011-04-17 09:04:46 UTC (rev 119943)
+++ gdm.install	2011-04-17 09:10:01 UTC (rev 119944)
@@ -2,31 +2,14 @@
 
 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}