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

[Jan de Groot]

    Date: Saturday, July 7, 2007 @ 06:42:37
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/file-roller

Modified: PKGBUILD (1.41 -> 1.42) file-roller.install (1.9 -> 1.10)

upgpkg: file-roller 2.18.4-1


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


Index: extra/gnome/file-roller/PKGBUILD
diff -u extra/gnome/file-roller/PKGBUILD:1.41 extra/gnome/file-roller/PKGBUILD:1.42
--- extra/gnome/file-roller/PKGBUILD:1.41	Fri Jun  1 05:06:50 2007
+++ extra/gnome/file-roller/PKGBUILD	Sat Jul  7 06:42:37 2007
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD,v 1.41 2007/06/01 09:06:50 jgc Exp $
+# $Id: PKGBUILD,v 1.42 2007/07/07 10:42:37 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=file-roller
-pkgver=2.18.3
+pkgver=2.18.4
 pkgrel=1
 pkgdesc="Archive manipulator for GNOME2"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('libgnomeui>=2.18.1-2' 'scrollkeeper' 'desktop-file-utils')
+depends=('libgnomeui>=2.18.1-2' 'scrollkeeper' 'desktop-file-utils' 'gconf>=2.18.0.1-4')
 makedepends=('perlxml' 'gnome-doc-utils>=0.10.3' 'pkgconfig' 'nautilus>=2.18.1')
 groups=('gnome-extra')
 options=('!libtool')
 install=file-roller.install
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('5b97ec91c0b29afd94b0f5dfc086ec5e')
+md5sums=('f651f951d5c1c24288c1a25b1f567be0')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
Index: extra/gnome/file-roller/file-roller.install
diff -u extra/gnome/file-roller/file-roller.install:1.9 extra/gnome/file-roller/file-roller.install:1.10
--- extra/gnome/file-roller/file-roller.install:1.9	Sun Apr 22 12:25:25 2007
+++ extra/gnome/file-roller/file-roller.install	Sat Jul  7 06:42:37 2007
@@ -1,8 +1,7 @@
 pkgname=file-roller
 
 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 --uninstall ${pkgname}
 }
 
 post_remove() {