From 40f0b1c7106cc1fed13f14e80f083ecd69c416f5 Mon Sep 17 00:00:00 2001
From: root <root@rshg047.dnsready.net>
Date: Sun, 1 May 2011 22:33:26 +0000
Subject: Sun May  1 22:33:26 UTC 2011

---
 extra/gnome-vfs/PKGBUILD | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'extra/gnome-vfs')

diff --git a/extra/gnome-vfs/PKGBUILD b/extra/gnome-vfs/PKGBUILD
index 61fbe0212..39abc3f5e 100644
--- a/extra/gnome-vfs/PKGBUILD
+++ b/extra/gnome-vfs/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 92007 2010-09-28 16:42:58Z ibiru $
+# $Id: PKGBUILD 119776 2011-04-15 07:50:36Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-vfs
 pkgver=2.24.4
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNOME Virtual File System"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('fam' 'gconf>=2.32.0' 'hal>=0.5.13' 'bzip2' 'avahi>=0.6.27' 'smbclient>=3.5.5' 'gnome-mime-data>=2.18.0-2' 'heimdal>=1.3.3' 'gnutls>=2.8.6')
+depends=('fam' 'gconf' 'bzip2' 'avahi' 'smbclient' 'gnome-mime-data' 'heimdal' 'gnutls')
 makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gnome-common')
 options=('!libtool' '!emptydirs' '!makeflags')
 conflicts=(gnome-vfs-samba)
@@ -16,17 +16,12 @@ 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.24/gnome-vfs-${pkgver}.tar.bz2
-        hal-show-volume-names.patch
         gnutls-config.patch)
 sha256sums=('62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa'
-            'b38b86d6c966dcf64f9140d800aebe8a14845bb8ce7c045f52d4df483cacd23b'
             '66c7cfb12995c0dd94a2caea95c7e3c55981993f05a79c585d60915ff131955d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  #Archlinux patch (b.g.o #321498)
-  patch -Np1 -i "${srcdir}/hal-show-volume-names.patch"
-
   #Fix build with new gnutls
   patch -Np1 -i "${srcdir}/gnutls-config.patch"
   libtoolize --force
@@ -37,13 +32,13 @@ build() {
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/gnome-vfs-2.0 \
-      --enable-samba --enable-hal \
+      --enable-samba --disable-hal \
       --enable-avahi --disable-howl \
       --disable-openssl --enable-gnutls
   make
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
 
   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
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-vfs-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas
   rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 }
-- 
cgit v1.2.3-54-g00ecf