[arch-commits] Commit in gvfs/trunk (6 files)

Jan Steffens heftig at archlinux.org
Mon May 9 20:32:36 UTC 2016


    Date: Monday, May 9, 2016 @ 22:32:36
  Author: heftig
Revision: 267279

1.28.2-1

Added:
  gvfs/trunk/gvfsd.hook
Modified:
  gvfs/trunk/PKGBUILD
  gvfs/trunk/gvfs-nfs.install
Deleted:
  gvfs/trunk/gvfs-module.install
  gvfs/trunk/gvfs-smb.install
  gvfs/trunk/gvfs.install

---------------------+
 PKGBUILD            |   21 +++++++++------------
 gvfs-module.install |    7 -------
 gvfs-nfs.install    |    1 -
 gvfs-smb.install    |   12 ------------
 gvfs.install        |   14 --------------
 gvfsd.hook          |   11 +++++++++++
 6 files changed, 20 insertions(+), 46 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-09 20:32:05 UTC (rev 267278)
+++ PKGBUILD	2016-05-09 20:32:36 UTC (rev 267279)
@@ -4,18 +4,20 @@
 pkgbase=gvfs
 pkgname=(gvfs gvfs-{smb,afc,gphoto2,goa,mtp,nfs,google})
 pkgdesc="Virtual filesystem implementation for GIO"
-pkgver=1.28.1
+url="https://wiki.gnome.org/Projects/gvfs"
+pkgver=1.28.2
 pkgrel=1
 arch=(i686 x86_64)
 license=(LGPL)
 depends=(avahi dconf fuse libarchive libcdio-paranoia libsoup udisks2 libsecret
-         libbluray libgudev gcr)
+         libbluray libgudev gcr psmisc)
 makedepends=(dbus intltool libgphoto2 libimobiledevice smbclient docbook-xsl
              gtk3 libmtp gnome-online-accounts libnfs libgdata)
-url="http://www.gnome.org"
 groups=(gnome)
-source=(https://download.gnome.org/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz)
-sha256sums=('4ecfe5ac35c1b3e61d6abddc98902b6c7faf243308c60b165f01990783f17999')
+source=(https://download.gnome.org/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz
+        gvfsd.hook)
+sha256sums=('bc6af45cff7e7e8d33c3a4be1d27e479f10f80105a6f2d1fae75c5c0d40636d9'
+            '478b9cf7b4c242959fc640dbf0cd4935f16c59b81f5828a3af102d608d7a9d72')
 
 prepare() {
   cd "$pkgbase-$pkgver"
@@ -41,7 +43,6 @@
               'gvfs-nfs: NFS support'
               'gvfs-google: Google Drive support'
               'gtk3: Recent files support')
-  install=gvfs.install
 
   cd "$pkgbase-$pkgver"
   sed -e 's/^am__append_4/#am__append_4/' \
@@ -51,6 +52,8 @@
       -i monitor/Makefile
   make DESTDIR="$pkgdir" install
 
+  install -Dm644 ../gvfsd.hook "$pkgdir/usr/share/libalpm/hooks/gvfsd.hook"
+
   cd "$pkgdir"
   rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,gphoto2,mtp,nfs,google}
   rm usr/share/gvfs/mounts/{smb,smb-browse,afc,gphoto2,mtp,nfs,google}.mount
@@ -61,7 +64,6 @@
 package_gvfs-smb() {
   pkgdesc+=" (SMB/CIFS backend; Windows client)"
   depends=("gvfs=$pkgver" smbclient)
-  install=gvfs-smb.install
 
   cd "$pkgbase-$pkgver/daemon"
   install -m755 -d "$pkgdir/usr/lib/gvfs"
@@ -79,7 +81,6 @@
 package_gvfs-afc() {
   pkgdesc+=" (AFC backend; Apple mobile devices)"
   depends=("gvfs=$pkgver" libimobiledevice usbmuxd)
-  install=gvfs-module.install
 
   cd "$pkgbase-$pkgver/daemon"
   install -D .libs/gvfsd-afc "$pkgdir/usr/lib/gvfs/gvfsd-afc"
@@ -92,7 +93,6 @@
 package_gvfs-gphoto2() {
   pkgdesc+=" (gphoto2 backend; PTP camera, MTP media player)"
   depends=("gvfs=$pkgver" libgphoto2)
-  install=gvfs-module.install
 
   cd "$pkgbase-$pkgver/daemon"
   install -D .libs/gvfsd-gphoto2 "$pkgdir/usr/lib/gvfs/gvfsd-gphoto2"
@@ -105,7 +105,6 @@
 package_gvfs-mtp() {
   pkgdesc+=" (MTP backend; Android, media player)"
   depends=("gvfs=$pkgver" libmtp)
-  install=gvfs-module.install
 
   cd "$pkgbase-$pkgver/daemon"
   install -D .libs/gvfsd-mtp "$pkgdir/usr/lib/gvfs/gvfsd-mtp"
@@ -118,7 +117,6 @@
 package_gvfs-goa() {
   pkgdesc+=" (Gnome Online Accounts backend; cloud storage)"
   depends=("gvfs=$pkgver" gnome-online-accounts)
-  install=gvfs-module.install
 
   cd "$srcdir/$pkgbase-$pkgver/monitor/goa"
   make DESTDIR="$pkgdir" install
@@ -137,7 +135,6 @@
 package_gvfs-google() {
   pkgdesc+=" (Google Drive backend)"
   depends=("gvfs-goa=$pkgver" libgdata)
-  install=gvfs-module.install
 
   cd "$pkgbase-$pkgver/daemon"
   install -D .libs/gvfsd-google "$pkgdir/usr/lib/gvfs/gvfsd-google"

Deleted: gvfs-module.install
===================================================================
--- gvfs-module.install	2016-05-09 20:32:05 UTC (rev 267278)
+++ gvfs-module.install	2016-05-09 20:32:36 UTC (rev 267279)
@@ -1,7 +0,0 @@
-post_install() {
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}

Modified: gvfs-nfs.install
===================================================================
--- gvfs-nfs.install	2016-05-09 20:32:05 UTC (rev 267278)
+++ gvfs-nfs.install	2016-05-09 20:32:36 UTC (rev 267279)
@@ -1,6 +1,5 @@
 post_install() {
   setcap 'cap_net_bind_service=+ep' usr/lib/gvfs/gvfsd-nfs
-  killall -USR1 gvfsd >&/dev/null || :
 }
 
 post_upgrade() {

Deleted: gvfs-smb.install
===================================================================
--- gvfs-smb.install	2016-05-09 20:32:05 UTC (rev 267278)
+++ gvfs-smb.install	2016-05-09 20:32:36 UTC (rev 267279)
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}

Deleted: gvfs.install
===================================================================
--- gvfs.install	2016-05-09 20:32:05 UTC (rev 267278)
+++ gvfs.install	2016-05-09 20:32:36 UTC (rev 267279)
@@ -1,14 +0,0 @@
-post_install() {
-  gio-querymodules /usr/lib/gio/modules
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  gio-querymodules /usr/lib/gio/modules
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}

Added: gvfsd.hook
===================================================================
--- gvfsd.hook	                        (rev 0)
+++ gvfsd.hook	2016-05-09 20:32:36 UTC (rev 267279)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/share/gvfs/*
+
+[Action]
+Description = Reloading GVFS config...
+When = PostTransaction
+Exec = /bin/sh -c 'killall -q -s USR1 gvfsd || true'



More information about the arch-commits mailing list