diff options
Diffstat (limited to 'abs/extra-testing/gnome-vfs')
| -rw-r--r-- | abs/extra-testing/gnome-vfs/PKGBUILD | 22 | ||||
| -rw-r--r-- | abs/extra-testing/gnome-vfs/gnome-vfs.install | 5 |
2 files changed, 11 insertions, 16 deletions
diff --git a/abs/extra-testing/gnome-vfs/PKGBUILD b/abs/extra-testing/gnome-vfs/PKGBUILD index dc848be..9a54cdd 100644 --- a/abs/extra-testing/gnome-vfs/PKGBUILD +++ b/abs/extra-testing/gnome-vfs/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 20541 2008-12-05 16:30:04Z allan $ +# $Id: PKGBUILD 30314 2009-03-18 21:34:12Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-vfs -pkgver=2.24.0 +pkgver=2.24.1 pkgrel=2 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') -makedepends=('perlxml' 'pkgconfig' 'intltool') +depends=('fam' 'gconf>=2.26.0-2' '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=('pkgconfig' 'intltool') options=('!libtool' '!emptydirs') conflicts=(gnome-vfs-samba) provides=(gnome-vfs-samba) @@ -17,10 +17,10 @@ url="http://www.gnome.org" 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 @@ build() { --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" --domain gnome-vfs-2.0 ${startdir}/pkg/etc/gconf/schemas/*.schemas + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas } diff --git a/abs/extra-testing/gnome-vfs/gnome-vfs.install b/abs/extra-testing/gnome-vfs/gnome-vfs.install index 0a77ef7..793a3e7 100644 --- a/abs/extra-testing/gnome-vfs/gnome-vfs.install +++ b/abs/extra-testing/gnome-vfs/gnome-vfs.install @@ -15,8 +15,3 @@ post_upgrade() { pre_remove() { usr/sbin/gconfpkg --uninstall ${pkgname} } - -op=$1 -shift - -$op $* |