[arch-commits] CVS update of extra/network/evolution (PKGBUILD evolution.install)

[Jan de Groot]

    Date: Saturday, July 7, 2007 @ 07:59:20
  Author: jgc
    Path: /home/cvs-extra/extra/network/evolution

Modified: PKGBUILD (1.59 -> 1.60) evolution.install (1.6 -> 1.7)

upgpkg: evolution 2.10.3-1


-------------------+
 PKGBUILD          |   10 +++++-----
 evolution.install |   14 ++------------
 2 files changed, 7 insertions(+), 17 deletions(-)


Index: extra/network/evolution/PKGBUILD
diff -u extra/network/evolution/PKGBUILD:1.59 extra/network/evolution/PKGBUILD:1.60
--- extra/network/evolution/PKGBUILD:1.59	Sat Jun  2 09:35:24 2007
+++ extra/network/evolution/PKGBUILD	Sat Jul  7 07:59:20 2007
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD,v 1.59 2007/06/02 13:35:24 tpowa Exp $
+# $Id: PKGBUILD,v 1.60 2007/07/07 11:59:20 jgc Exp $
 # Maintainer: dale <dale at archlinux.org>
 
 pkgname=evolution
-pkgver=2.10.2
-pkgrel=2
+pkgver=2.10.3
+pkgrel=1
 pkgdesc="Integrated Workgroup and Personal Information Management for Gnome"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('libnetworkmanager>=0.6.5' 'libnotify>=0.4.4' 'gtkhtml>=3.14.2' 'evolution-data-server>=1.10.2' 'libgnomeprintui>=2.18.0' 'scrollkeeper')
+depends=('libnetworkmanager>=0.6.5' 'libnotify>=0.4.4' 'gtkhtml>=3.14.3' 'evolution-data-server>=1.10.3.1' 'libgnomeprintui>=2.18.0' 'scrollkeeper' 'gconf>=2.18.0.1-4')
 makedepends=('perlxml' 'gnome-pilot>=2.0.15-2' 'pkgconfig' 'gnome-doc-utils>=0.10.3')
 options=('!libtool')
 install=evolution.install
@@ -15,7 +15,7 @@
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.10/${pkgname}-${pkgver}.tar.bz2
 	new-mail-notify-unresolved-symbols.patch
 	bgo407104.patch)
-md5sums=('4b495be7f5e146ce7b5807134586336e'
+md5sums=('09cc60b037849b3c9b34961eb7da217f'
          '3d02da4cc6cbaf63381a23a08bdc52ba'
          'e27cb071ca4e40e34b8d69c916211116')
 
Index: extra/network/evolution/evolution.install
diff -u extra/network/evolution/evolution.install:1.6 extra/network/evolution/evolution.install:1.7
--- extra/network/evolution/evolution.install:1.6	Sun Apr 22 14:19:37 2007
+++ extra/network/evolution/evolution.install	Sat Jul  7 07:59:20 2007
@@ -1,8 +1,7 @@
 pkgname=evolution
 
 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}
   scrollkeeper-update -q -p var/lib/scrollkeeper
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
@@ -16,16 +15,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() {