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

[Jan de Groot]

    Date: Sunday, September 23, 2007 @ 09:33:11
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-utils

Modified: PKGBUILD (1.29 -> 1.30) gnome-utils.install (1.9 -> 1.10)

upgpkg: gnome-utils 2.20.0.1-1
GNOME 2.20


---------------------+
 PKGBUILD            |   14 +++++++-------
 gnome-utils.install |   16 ++--------------
 2 files changed, 9 insertions(+), 21 deletions(-)


Index: extra/gnome/gnome-utils/PKGBUILD
diff -u extra/gnome/gnome-utils/PKGBUILD:1.29 extra/gnome/gnome-utils/PKGBUILD:1.30
--- extra/gnome/gnome-utils/PKGBUILD:1.29	Sun Apr 22 11:50:40 2007
+++ extra/gnome/gnome-utils/PKGBUILD	Sun Sep 23 09:33:10 2007
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD,v 1.29 2007/04/22 15:50:40 jgc Exp $
+# $Id: PKGBUILD,v 1.30 2007/09/23 13:33:10 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-utils
-pkgver=2.18.1
+pkgver=2.20.0.1
 pkgrel=1
 pkgdesc="Common utilities for GNOME"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('libgtop>=2.14.8-2' 'libgnomeprintui>=2.18.0' 'gnome-panel>=2.18.1' 'scrollkeeper')
-makedepends=('perlxml' 'gnome-doc-utils>=0.10.3' 'pkgconfig' 'gtk-doc')
-options=('nolibtool')
+depends=('libgtop>=2.20.0' 'libgnomeprintui>=2.18.1' 'gnome-panel>=2.20.0')
+makedepends=('perlxml' 'gnome-doc-utils>=0.12.0' 'pkgconfig')
+options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 groups=('gnome-extra')
 install=gnome-utils.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('10e8bd928d099a0d1f70919c8b7b7784')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('2d4385df2fb566b437b283bd2ce70190')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
Index: extra/gnome/gnome-utils/gnome-utils.install
diff -u extra/gnome/gnome-utils/gnome-utils.install:1.9 extra/gnome/gnome-utils/gnome-utils.install:1.10
--- extra/gnome/gnome-utils/gnome-utils.install:1.9	Sun Apr 22 11:50:40 2007
+++ extra/gnome/gnome-utils/gnome-utils.install	Sun Sep 23 09:33:11 2007
@@ -1,9 +1,7 @@
 pkgname=gnome-utils
 
 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
-  scrollkeeper-update -q -p var/lib/scrollkeeper
+  usr/sbin/gconfpkg --install ${pkgname}
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
@@ -16,20 +14,10 @@
 }
 
 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() {
-  scrollkeeper-update -q -p var/lib/scrollkeeper
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }