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

[Jan de Groot]

    Date: Thursday, September 20, 2007 @ 17:12:21
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-vfs

Modified: PKGBUILD (1.49 -> 1.50) gnome-vfs.install (1.10 -> 1.11)

upgpkg: gnome-vfs 2.20.0-1
Remove empty directories, update to GNOME 2.20


-------------------+
 PKGBUILD          |   16 ++++++++--------
 gnome-vfs.install |   14 ++------------
 2 files changed, 10 insertions(+), 20 deletions(-)


Index: extra/gnome/gnome-vfs/PKGBUILD
diff -u extra/gnome/gnome-vfs/PKGBUILD:1.49 extra/gnome/gnome-vfs/PKGBUILD:1.50
--- extra/gnome/gnome-vfs/PKGBUILD:1.49	Mon Jun  4 11:53:43 2007
+++ extra/gnome/gnome-vfs/PKGBUILD	Thu Sep 20 17:12:21 2007
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD,v 1.49 2007/06/04 15:53:43 jgc Exp $
+# $Id: PKGBUILD,v 1.50 2007/09/20 21:12:21 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-vfs
-pkgver=2.18.1
-pkgrel=2
+pkgver=2.20.0
+pkgrel=1
 pkgdesc="The GNOME Virtual File System"
 arch=(i686 x86_64)
-license=(GPL)
-depends=('fam' 'gconf>=2.18.0.1-2' 'hal>=0.5.9' 'bzip2' 'avahi>=0.6.17' 'smbclient>=3.0.25a-2' 'acl' 'gnome-mime-data>=2.18.0-2' 'heimdal>=0.8.1')
+license=('LGPL')
+depends=('fam' 'gconf>=2.20.0' 'hal>=0.5.9.1' 'bzip2' 'avahi>=0.6.17' 'smbclient>=3.0.24-2' 'acl' 'gnome-mime-data>=2.18.0-2')
 makedepends=('perlxml' 'pkgconfig')
-options=('!libtool')
+options=('!libtool' '!emptydirs')
 conflicts=(gnome-vfs-samba)
 provides=(gnome-vfs-samba)
 replaces=(gnome-vfs-samba gnome-vfs-extras)
 url="http://www.gnome.org"
 install=gnome-vfs.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/gnome-vfs-${pkgver}.tar.bz2
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/gnome-vfs-${pkgver}.tar.bz2
 	gnome-vfs-2.15.1-use-sys-inotify.patch
 	hal-show-volume-names.patch)
-md5sums=('bf4a6d95180d05981893e5d021c6695c' '167b74db0622d5057114f62f020aad39'\
+md5sums=('b9fe0a066d0e693e74a000e55338235b' '167b74db0622d5057114f62f020aad39'\
          '109d07aa1dc8cb6523c47c4984047dce')
 
 build() {
Index: extra/gnome/gnome-vfs/gnome-vfs.install
diff -u extra/gnome/gnome-vfs/gnome-vfs.install:1.10 extra/gnome/gnome-vfs/gnome-vfs.install:1.11
--- extra/gnome/gnome-vfs/gnome-vfs.install:1.10	Sun Apr 22 09:55:08 2007
+++ extra/gnome/gnome-vfs/gnome-vfs.install	Thu Sep 20 17:12:21 2007
@@ -1,8 +1,7 @@
 pkgname=gnome-vfs
 
 post_install() {
-  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
-
-  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