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

[Jan de Groot]

    Date: Saturday, July 7, 2007 @ 06:39:24
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-session

Modified: PKGBUILD (1.36 -> 1.37) gnome-session.install (1.8 -> 1.9)

upgpkg: gnome-session 2.18.3-1


-----------------------+
 PKGBUILD              |    8 ++++----
 gnome-session.install |   14 ++------------
 2 files changed, 6 insertions(+), 16 deletions(-)


Index: extra/gnome/gnome-session/PKGBUILD
diff -u extra/gnome/gnome-session/PKGBUILD:1.36 extra/gnome/gnome-session/PKGBUILD:1.37
--- extra/gnome/gnome-session/PKGBUILD:1.36	Fri Jun  1 05:25:36 2007
+++ extra/gnome/gnome-session/PKGBUILD	Sat Jul  7 06:39:24 2007
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD,v 1.36 2007/06/01 09:25:36 jgc Exp $
+# $Id: PKGBUILD,v 1.37 2007/07/07 10:39:24 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-session
-pkgver=2.18.2
+pkgver=2.18.3
 pkgrel=1
 pkgdesc="The GNOME Session Handler"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
-depends=('tcp_wrappers' 'gnome-desktop>=2.18.1')
+depends=('tcp_wrappers' 'gnome-desktop>=2.18.1' 'gconf>=2.18.0.1-4')
 makedepends=('perlxml' 'pkgconfig' 'control-center>=2.18.1')
 install=gnome-session.install
 url="http://www.gnome.org"
@@ -15,7 +15,7 @@
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2
 	gsm-dbus.patch
 	gnome.desktop)
-md5sums=('a717b193386f634bd316e2e5a9dab75a' '80f38a9a76938d08e6437fea24c841b3'
+md5sums=('59b6809ed1d8e39c1550217e665c75df' '80f38a9a76938d08e6437fea24c841b3'
 	 '152cddde06e16f16641746467f7ff965')
 
 build() {
Index: extra/gnome/gnome-session/gnome-session.install
diff -u extra/gnome/gnome-session/gnome-session.install:1.8 extra/gnome/gnome-session/gnome-session.install:1.9
--- extra/gnome/gnome-session/gnome-session.install:1.8	Sun Apr 22 12:22:33 2007
+++ extra/gnome/gnome-session/gnome-session.install	Sat Jul  7 06:39:24 2007
@@ -1,8 +1,7 @@
 pkgname=gnome-session
 
 post_install() {
-  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}
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
@@ -15,16 +14,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 --uninstall ${pkgname}
 }
 
 post_remove() {