Wed Apr 25 00:01:35 UTC 2012

3 files changed, 49 insertions, 50 deletions

diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD
index b347eae87..d8f5938a8 100644
--- a/extra/gvfs/PKGBUILD
+++ b/extra/gvfs/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 150878 2012-02-23 13:48:04Z allan $
+# $Id: PKGBUILD 156884 2012-04-23 09:08:18Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gvfs
 pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp')
-pkgver=1.10.1
-pkgrel=3
+pkgver=1.12.1
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL')
-makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2' 'libarchive' 'libgdu' 'pkgconfig' 'intltool' 'libimobiledevice' 'avahi' 'dconf')
+makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2')
 url="http://www.gnome.org"
 options=(!libtool)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz)
-sha256sums=('cd30facee5ad6cd0fafc5337bbf7c06a0bff3936f9ff2ae31519b301efcc9288')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
+sha256sums=('d75dbb0cee87ca93f393c96da56affa51609114814b87771cfc9871c09b5355e')
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd "$pkgbase-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/gvfs \
@@ -24,7 +24,7 @@ build() {
 
 package_gvfs() {
   pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio"
-  depends=('libsoup-gnome' 'libgdu' 'libcdio' 'fuse' 'libarchive' 'avahi' 'dconf')
+  depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio' 'libsoup-gnome' 'udisks2')
   optdepends=('gvfs-afc: AFC (mobile devices) support'
               'gvfs-smb: SMB/CIFS (Windows client) support'
               'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support'
@@ -32,13 +32,13 @@ package_gvfs() {
               'gvfs-afp: Apple Filing Protocol (AFP) support')
   install=gvfs.install
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  sed -e 's/^am__append_3/#am__append_3/' \
-      -e 's/^am__append_4/#am__append_4/' \
+  cd "$pkgbase-$pkgver"
+  sed -e 's/^am__append_4/#am__append_4/' \
+      -e 's/^am__append_5/#am__append_5/' \
       -i monitor/Makefile
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="$pkgdir" install
 
-  cd "${pkgdir}"
+  cd "$pkgdir"
   rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}
   rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}.mount
   rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
@@ -47,67 +47,66 @@ package_gvfs() {
 
 package_gvfs-smb() {
   pkgdesc="SMB/CIFS (Windows client) backend for gvfs"
-  depends=("gvfs=${pkgver}" 'smbclient' 'libgnome-keyring')
+  depends=("gvfs=$pkgver" 'smbclient' 'libgnome-keyring')
   install=gvfs-smb.install
 
-  cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
-  install -m755 -d "${pkgdir}/usr/lib/gvfs"
-  install -m755 -d "${pkgdir}/usr/share/gvfs/mounts"
+  cd "$pkgbase-$pkgver/daemon"
+  install -m755 -d "$pkgdir/usr/lib/gvfs"
+  install -m755 -d "$pkgdir/usr/share/gvfs/mounts"
 
-  install -m755 .libs/gvfsd-smb{,-browse} "${pkgdir}/usr/lib/gvfs/"
-  install -m644 smb{,-browse}.mount "${pkgdir}/usr/share/gvfs/mounts/"
+  install -m755 .libs/gvfsd-smb{,-browse} "$pkgdir/usr/lib/gvfs/"
+  install -m644 smb{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/"
 
   install -Dm644 org.gnome.system.smb.gschema.xml \
-    "${pkgdir}/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml"
+    "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml"
   install -Dm644 gvfs-smb.convert \
-    "${pkgdir}/usr/share/GConf/gsettings/gvfs-smb.convert"
+    "$pkgdir/usr/share/GConf/gsettings/gvfs-smb.convert"
 }
 
 package_gvfs-afc() {
   pkgdesc="AFC (mobile devices) backend for gvfs"
-  depends=("gvfs=${pkgver}" 'libimobiledevice')
+  depends=("gvfs=$pkgver" 'libimobiledevice')
   install=gvfs-module.install
 
-  cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
-  install -D .libs/gvfsd-afc "${pkgdir}/usr/lib/gvfs/gvfsd-afc"
-  install -Dm644 afc.mount "${pkgdir}/usr/share/gvfs/mounts/afc.mount"
+  cd "$pkgbase-$pkgver/daemon"
+  install -D .libs/gvfsd-afc "$pkgdir/usr/lib/gvfs/gvfsd-afc"
+  install -Dm644 afc.mount "$pkgdir/usr/share/gvfs/mounts/afc.mount"
 
-  cd "${srcdir}/${pkgbase}-${pkgver}/monitor/afc"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgbase-$pkgver/monitor/afc"
+  make DESTDIR="$pkgdir" install
 }
 
 package_gvfs-gphoto2() {
   pkgdesc="gphoto2 (PTP camera/MTP media player) backend for gvfs"
-  depends=("gvfs=${pkgver}" 'dbus-core' 'libgphoto2' 'udev')
+  depends=("gvfs=$pkgver" 'dbus-core' 'libgphoto2' 'udev')
   install=gvfs-module.install
 
-  cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
-  install -D .libs/gvfsd-gphoto2 "${pkgdir}/usr/lib/gvfs/gvfsd-gphoto2"
-  install -Dm644 gphoto2.mount "${pkgdir}/usr/share/gvfs/mounts/gphoto2.mount"
+  cd "$pkgbase-$pkgver/daemon"
+  install -D .libs/gvfsd-gphoto2 "$pkgdir/usr/lib/gvfs/gvfsd-gphoto2"
+  install -Dm644 gphoto2.mount "$pkgdir/usr/share/gvfs/mounts/gphoto2.mount"
 
-  cd "${srcdir}/${pkgbase}-${pkgver}/monitor/gphoto2"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgbase-$pkgver/monitor/gphoto2"
+  make DESTDIR="$pkgdir" install
 }
 
 package_gvfs-obexftp() {
   pkgdesc="ObexFTP (bluetooth) backend for gvfs"
-  depends=("gvfs=${pkgver}" 'dbus-glib' 'bluez' 'obex-data-server')
+  depends=("gvfs=$pkgver" 'dbus-glib' 'bluez' 'obex-data-server')
   install=gvfs-module.install
 
-  cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
-  install -D .libs/gvfsd-obexftp "${pkgdir}/usr/lib/gvfs/gvfsd-obexftp"
-  install -Dm644 obexftp.mount "${pkgdir}/usr/share/gvfs/mounts/obexftp.mount"
+  cd "$pkgbase-$pkgver/daemon"
+  install -D .libs/gvfsd-obexftp "$pkgdir/usr/lib/gvfs/gvfsd-obexftp"
+  install -Dm644 obexftp.mount "$pkgdir/usr/share/gvfs/mounts/obexftp.mount"
 }
 
 package_gvfs-afp() {
   pkgdesc="Apple Filing Protocol (AFP) backend for gvfs"
-  depends=("gvfs=${pkgver}")
+  depends=("gvfs=$pkgver")
   install=gvfs-module.install
-  install -m755 -d "${pkgdir}/usr/lib/gvfs"
-  install -m755 -d "${pkgdir}/usr/share/gvfs/mounts"
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
-  install -m755 .libs/gvfsd-afp{,-browse} "${pkgdir}/usr/lib/gvfs/"
-  install -m644 afp{,-browse}.mount "${pkgdir}/usr/share/gvfs/mounts/"
+  install -m755 -d "$pkgdir/usr/lib/gvfs"
+  install -m755 -d "$pkgdir/usr/share/gvfs/mounts"
 
+  cd "$pkgbase-$pkgver/daemon"
+  install -m755 .libs/gvfsd-afp{,-browse} "$pkgdir/usr/lib/gvfs/"
+  install -m644 afp{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/"
 }
diff --git a/extra/gvfs/gvfs-smb.install b/extra/gvfs/gvfs-smb.install
index 0b8783c7b..da6a2ab6d 100644
--- a/extra/gvfs/gvfs-smb.install
+++ b/extra/gvfs/gvfs-smb.install
@@ -1,5 +1,5 @@
 post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  glib-compile-schemas /usr/share/glib-2.0/schemas
   killall -USR1 gvfsd >&/dev/null || :
 }
 
@@ -8,5 +8,5 @@ post_upgrade() {
 }
 
 post_remove() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  glib-compile-schemas /usr/share/glib-2.0/schemas
 }
diff --git a/extra/gvfs/gvfs.install b/extra/gvfs/gvfs.install
index 9458b1513..3482d99e3 100644
--- a/extra/gvfs/gvfs.install
+++ b/extra/gvfs/gvfs.install
@@ -1,6 +1,6 @@
 post_install() {
-  usr/bin/gio-querymodules usr/lib/gio/modules
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  gio-querymodules /usr/lib/gio/modules
+  glib-compile-schemas /usr/share/glib-2.0/schemas
   killall -USR1 gvfsd >&/dev/null || :
 }
 
@@ -9,6 +9,6 @@ post_upgrade() {
 }
 
 post_remove() {
-  usr/bin/gio-querymodules usr/lib/gio/modules
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  gio-querymodules /usr/lib/gio/modules
+  glib-compile-schemas /usr/share/glib-2.0/schemas
 }