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

[Jan de Groot]

    Date: Wednesday, September 5, 2007 @ 04:04:15
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/libgsf-gnome

Modified: PKGBUILD (1.17 -> 1.18) libgsf-gnome.install (1.3 -> 1.4)

upgpkg: libgsf-gnome 1.14.6-1
Switch to new gconf handling


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


Index: extra/gnome/libgsf-gnome/PKGBUILD
diff -u extra/gnome/libgsf-gnome/PKGBUILD:1.17 extra/gnome/libgsf-gnome/PKGBUILD:1.18
--- extra/gnome/libgsf-gnome/PKGBUILD:1.17	Mon Jul 16 21:14:15 2007
+++ extra/gnome/libgsf-gnome/PKGBUILD	Wed Sep  5 04:04:14 2007
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD,v 1.17 2007/07/17 01:14:15 eric Exp $
+# $Id: PKGBUILD,v 1.18 2007/09/05 08:04:14 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
 
 pkgname=libgsf-gnome
-pkgver=1.14.5
-pkgrel=2
+pkgver=1.14.6
+pkgrel=1
 pkgdesc="Adds gnome support to libgsf"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
-depends=('gnome-vfs>=2.18.1' 'libbonobo>=2.18.0-2' "libgsf>=${pkgver}")
+depends=('gnome-vfs>=2.18.1' 'libbonobo>=2.18.0-2' "libgsf>=${pkgver}" 'gconf>=2.18.0.1-4')
 makedepends=('perlxml' 'pkgconfig')
 options=('!libtool')
 install=libgsf-gnome.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/libgsf/1.14/libgsf-${pkgver}.tar.bz2)
-md5sums=('0c1a70ca77aef5706544c1b4082a632a')
+md5sums=('5939265125356730fc1d90c8ee3af7eb')
 
 build() {
   cd ${startdir}/src/libgsf-${pkgver}
Index: extra/gnome/libgsf-gnome/libgsf-gnome.install
diff -u extra/gnome/libgsf-gnome/libgsf-gnome.install:1.3 extra/gnome/libgsf-gnome/libgsf-gnome.install:1.4
--- extra/gnome/libgsf-gnome/libgsf-gnome.install:1.3	Sun Apr 22 12:44:10 2007
+++ extra/gnome/libgsf-gnome/libgsf-gnome.install	Wed Sep  5 04:04:14 2007
@@ -1,8 +1,7 @@
 pkgname=libgsf-gnome
 
 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}
 }
 
 pre_upgrade() {
@@ -14,16 +13,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}
 }
 
 op=$1