[arch-commits] CVS update of extra/multimedia/gthumb (PKGBUILD gthumb.install)

[Jan de Groot]

    Date: Thursday, June 21, 2007 @ 15:30:18
  Author: jgc
    Path: /home/cvs-extra/extra/multimedia/gthumb

Modified: PKGBUILD (1.38 -> 1.39) gthumb.install (1.7 -> 1.8)

upgpkg: gthumb 2.10.4-1


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


Index: extra/multimedia/gthumb/PKGBUILD
diff -u extra/multimedia/gthumb/PKGBUILD:1.38 extra/multimedia/gthumb/PKGBUILD:1.39
--- extra/multimedia/gthumb/PKGBUILD:1.38	Thu May 17 10:43:48 2007
+++ extra/multimedia/gthumb/PKGBUILD	Thu Jun 21 15:30:15 2007
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD,v 1.38 2007/05/17 14:43:48 jgc Exp $
+# $Id: PKGBUILD,v 1.39 2007/06/21 19:30:15 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Tobias Kieslich <tobias at justdreams.de>
  
 pkgname=gthumb
-pkgver=2.10.3
+pkgver=2.10.4
 pkgrel=1
 pkgdesc="Image browser and viewer for the GNOME Desktop"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://gthumb.sourceforge.net/"
-depends=('libgphoto2>=2.3.1' 'libgnomeui>=2.18.1-2' 'libxtst' 'libxxf86vm' 'scrollkeeper' 'desktop-file-utils')
+depends=('libgphoto2>=2.3.1' 'libgnomeui>=2.18.1-2' 'libxtst' 'libxxf86vm' 'scrollkeeper' 'desktop-file-utils' 'gconf>=2.18.0.1-4')
 makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils')
-options=('nolibtool')
+options=('!libtool')
 install=gthumb.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.10/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('47348024d8b7e373c6ff4f41b153cb48')
+md5sums=('090b0cd29cfbcd50c77b4f645472ac38')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
Index: extra/multimedia/gthumb/gthumb.install
diff -u extra/multimedia/gthumb/gthumb.install:1.7 extra/multimedia/gthumb/gthumb.install:1.8
--- extra/multimedia/gthumb/gthumb.install:1.7	Sun Apr 22 11:14:34 2007
+++ extra/multimedia/gthumb/gthumb.install	Thu Jun 21 15:30:17 2007
@@ -1,8 +1,7 @@
 pkgname=gthumb
 
 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
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
@@ -17,16 +16,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() {