[arch-commits] Commit in gnome-vfs/trunk (PKGBUILD gnome-vfs.install)

[Jan de Groot]

    Date: Tuesday, March 17, 2009 @ 14:07:28
  Author: jgc
Revision: 30214

upgpkg: gnome-vfs 2.24.1-1
    GNOME 2.26

Modified:
  gnome-vfs/trunk/PKGBUILD
  gnome-vfs/trunk/gnome-vfs.install

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-17 18:01:50 UTC (rev 30213)
+++ PKGBUILD	2009-03-17 18:07:28 UTC (rev 30214)
@@ -2,12 +2,12 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-vfs
-pkgver=2.24.0
-pkgrel=2
+pkgver=2.24.1
+pkgrel=1
 pkgdesc="The GNOME Virtual File System"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('fam' 'gconf>=2.24' 'hal>=0.5.11' 'bzip2' 'avahi>=0.6.23' 'smbclient>=3.0.31' 'gnome-mime-data>=2.18.0-2' 'heimdal>=1.2' 'gnutls>=2.4.1')
+depends=('fam' 'gconf>=2.26.0' 'hal>=0.5.11' 'bzip2' 'avahi>=0.6.24' 'smbclient>=3.3.1' 'gnome-mime-data>=2.18.0-2' 'heimdal>=1.2.1' 'gnutls>=2.6.4')
 makedepends=('perlxml' 'pkgconfig' 'intltool')
 options=('!libtool' '!emptydirs')
 conflicts=(gnome-vfs-samba)
@@ -17,10 +17,10 @@
 install=gnome-vfs.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/gnome-vfs-${pkgver}.tar.bz2
 	hal-show-volume-names.patch)
-md5sums=('870ee8861bfcaeb852934e95657ef83e' '109d07aa1dc8cb6523c47c4984047dce')
+md5sums=('100f9af16dc659e375ee8da45175a28d' '109d07aa1dc8cb6523c47c4984047dce')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   #Archlinux patch (b.g.o #321498)
   patch -Np1 -i ${startdir}/src/hal-show-volume-names.patch || return 1
 
@@ -29,11 +29,11 @@
 	--libexecdir=/usr/lib/gnome-vfs-2.0 \
   	--enable-samba --enable-hal \
         --enable-avahi --disable-howl \
-	--disable-openssl --enable-gnutls
+	--disable-openssl --enable-gnutls || return 1
   make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
 
-  mkdir -p ${startdir}/pkg/usr/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas
-  rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
+  install -d -m755 "${pkgdir}/usr/share/gconf/schemas"
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" ${startdir}/pkg/etc/gconf/schemas/*.schemas
+  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 }

Modified: gnome-vfs.install
===================================================================
--- gnome-vfs.install	2009-03-17 18:01:50 UTC (rev 30213)
+++ gnome-vfs.install	2009-03-17 18:07:28 UTC (rev 30214)
@@ -15,8 +15,3 @@
 pre_remove() {
   usr/sbin/gconfpkg --uninstall ${pkgname}
 }
-
-op=$1
-shift
-
-$op $*