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

[Jan de Groot]

    Date: Saturday, September 22, 2007 @ 18:40:19
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gconf-editor

Modified: PKGBUILD (1.23 -> 1.24) gconf-editor.install (1.5 -> 1.6)

upgpkg: gconf-editor 2.20.0-1
GNOME 2.20


----------------------+
 PKGBUILD             |   15 ++++++++-------
 gconf-editor.install |   16 ++--------------
 2 files changed, 10 insertions(+), 21 deletions(-)


Index: extra/gnome/gconf-editor/PKGBUILD
diff -u extra/gnome/gconf-editor/PKGBUILD:1.23 extra/gnome/gconf-editor/PKGBUILD:1.24
--- extra/gnome/gconf-editor/PKGBUILD:1.23	Tue Aug 28 10:15:36 2007
+++ extra/gnome/gconf-editor/PKGBUILD	Sat Sep 22 18:40:19 2007
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD,v 1.23 2007/08/28 14:15:36 jgc Exp $
+# $Id: PKGBUILD,v 1.24 2007/09/22 22:40:19 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gconf-editor
-pkgver=2.18.2
+pkgver=2.20.0
 pkgrel=1
-pkgdesc="Graphics gconf registry editor"
+pkgdesc="Graphical gconf registry editor"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('libgnomeui>=2.18.1-2' 'scrollkeeper')
-makedepends=('pkgconfig' 'perlxml' 'gnome-doc-utils>=0.10.3')
+depends=('libgnomeui>=2.20.0')
+makedepends=('pkgconfig' 'perlxml' 'gnome-doc-utils>=0.12.0')
 url="http://www.gnome.org"
 groups=('gnome-extra')
+options=(!emptydirs)
 install=gconf-editor.install
-source=(http://ftp.gnome.org/pub/gnome/sources/gconf-editor/2.18/gconf-editor-${pkgver}.tar.bz2)
-md5sums=('e40f51b3cb2809b882c29d45b71657bd')
+source=(http://ftp.gnome.org/pub/gnome/sources/gconf-editor/2.20/gconf-editor-${pkgver}.tar.bz2)
+md5sums=('b686677878b5754ffa8d0a2cc1129988')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
Index: extra/gnome/gconf-editor/gconf-editor.install
diff -u extra/gnome/gconf-editor/gconf-editor.install:1.5 extra/gnome/gconf-editor/gconf-editor.install:1.6
--- extra/gnome/gconf-editor/gconf-editor.install:1.5	Sun Apr 22 12:26:37 2007
+++ extra/gnome/gconf-editor/gconf-editor.install	Sat Sep 22 18:40:19 2007
@@ -1,9 +1,7 @@
 pkgname=gconf-editor
 
 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
 }