[arch-commits] CVS update of extra/gnome/gdm (PKGBUILD gdm.install)

[Jan de Groot]

    Date: Saturday, July 7, 2007 @ 05:56:58
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gdm

Modified: PKGBUILD (1.59 -> 1.60) gdm.install (1.11 -> 1.12)

upgpkg: gdm 2.18.3-1


-------------+
 PKGBUILD    |    8 ++++----
 gdm.install |   15 +++------------
 2 files changed, 7 insertions(+), 16 deletions(-)


Index: extra/gnome/gdm/PKGBUILD
diff -u extra/gnome/gdm/PKGBUILD:1.59 extra/gnome/gdm/PKGBUILD:1.60
--- extra/gnome/gdm/PKGBUILD:1.59	Sun Jun 17 11:59:07 2007
+++ extra/gnome/gdm/PKGBUILD	Sat Jul  7 05:56:57 2007
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD,v 1.59 2007/06/17 15:59:07 jgc Exp $
+# $Id: PKGBUILD,v 1.60 2007/07/07 09:56:57 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=gdm
-pkgver=2.18.2
+pkgver=2.18.3
 pkgrel=1
 pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('pam' 'libdmx' 'tcp_wrappers>=7.6' 'libgnomecanvas>=2.14.0-2' 'librsvg>=2.16.1' 'gksu' 'popt' 'xorg-xsm' 'dbus-glib>=0.7.3' 'scrollkeeper')
+depends=('pam' 'libdmx' 'tcp_wrappers>=7.6' 'libgnomecanvas>=2.14.0-2' 'librsvg>=2.16.1' 'gksu' 'popt' 'xorg-xsm' 'dbus-glib>=0.7.4' 'scrollkeeper' 'gconf>=2.18.0.1-4')
 makedepends=('perlxml' 'zenity>=2.18.1' 'gnome-doc-utils>=0.10.3' 'pkgconfig')
 install=gdm.install
 url="http://www.gnome.org"
@@ -19,7 +19,7 @@
 	gdm.pam
 	gdm-autologin.pam
 	gdm-stop.diff)
-md5sums=('40c8e0cef366ac225a7bf47178c2a7d0' '770fe5aeb8d35271a5a2330ce01508f0'
+md5sums=('08555fce34d247062625c1a451a4d5a6' '770fe5aeb8d35271a5a2330ce01508f0'
          '682c0602f2f235085d5d9255428d7a35' 'b20fe3c8487a039050986d60e45233a9'
 	 '157f32e089a7aab50732dc122e592b35' 'aebb718505664be074531c8dfaf04dfc')
 
Index: extra/gnome/gdm/gdm.install
diff -u extra/gnome/gdm/gdm.install:1.11 extra/gnome/gdm/gdm.install:1.12
--- extra/gnome/gdm/gdm.install:1.11	Mon Apr 23 13:03:44 2007
+++ extra/gnome/gdm/gdm.install	Sat Jul  7 05:56:58 2007
@@ -4,8 +4,8 @@
   getent group gdm >/dev/null 2>&1 || groupadd gdm
   chown root.gdm /var/lib/gdm > /dev/null
   chmod 1770 /var/lib/gdm > /dev/null
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/${pkgname}.schemas >/dev/null
+
+  usr/sbin/gconfpkg --install ${pkgname}
   scrollkeeper-update -q -p var/lib/scrollkeeper 
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
@@ -28,16 +28,7 @@
 }
 
 pre_remove() {
-  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=(usr/share/gconf/schemas/${pkgname}.schemas)
-  elif [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=(opt/gnome/share/gconf/schemas/${pkgname}.schemas)
-  else
-    schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
-  fi
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-
-  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+  usr/sbin/gconfpkg --install ${pkgname}
 }
 
 post_remove() {