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

[Jan Steffens]

    Date: Sunday, February 13, 2011 @ 12:36:26
  Author: heftig
Revision: 109901

upgpkg: gvfs 1.7.2-2
Fix schemas and move smb schemas

Modified:
  gvfs/trunk/PKGBUILD
  gvfs/trunk/gvfs.install

--------------+
 PKGBUILD     |   36 +++++++++++++++++-------------------
 gvfs.install |    1 +
 2 files changed, 18 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-02-13 17:08:15 UTC (rev 109900)
+++ PKGBUILD	2011-02-13 17:36:26 UTC (rev 109901)
@@ -4,7 +4,7 @@
 pkgbase=gvfs
 pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-gphoto2' 'gvfs-obexftp')
 pkgver=1.7.2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('LGPL')
 makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2'
@@ -40,14 +40,16 @@
   make DESTDIR="${pkgdir}" install
 
   cd "${pkgdir}"
-  rm -f usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,gphoto2,obexftp}
-  rm -f usr/share/gvfs/mounts/{smb,smb-browse,afc,gphoto2,obexftp}.mount
+  rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,gphoto2,obexftp}
+  rm usr/share/gvfs/mounts/{smb,smb-browse,afc,gphoto2,obexftp}.mount
+  rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
+  rm usr/share/GConf/gsettings/gvfs-smb.convert
 }
 
 package_gvfs-smb() {
   pkgdesc="SMB/CIFS (Windows client) backend for gvfs"
   depends=("gvfs=${pkgver}" 'smbclient' 'libgnome-keyring')
-  install=gvfs-module.install
+  install=gvfs-smb.install
 
   cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
   install -m755 -d "${pkgdir}/usr/lib/gvfs"
@@ -55,6 +57,11 @@
 
   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"
+  install -Dm644 gvfs-smb.convert \
+    "${pkgdir}/usr/share/GConf/gsettings/gvfs-smb.convert"
 }
 
 package_gvfs-afc() {
@@ -63,12 +70,9 @@
   install=gvfs-module.install
 
   cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
-  install -m755 -d "${pkgdir}/usr/lib/gvfs"
-  install -m755 -d "${pkgdir}/usr/share/gvfs/mounts"
+  install -D .libs/gvfsd-afc "${pkgdir}/usr/lib/gvfs/gvfsd-afc"
+  install -Dm644 afc.mount "${pkgdir}/usr/share/gvfs/mounts/afc.mount"
 
-  install -m755 .libs/gvfsd-afc "${pkgdir}/usr/lib/gvfs/"
-  install -m644 afc.mount "${pkgdir}/usr/share/gvfs/mounts/"
-
   cd "${srcdir}/${pkgbase}-${pkgver}/monitor/afc"
   make DESTDIR="${pkgdir}" install
 }
@@ -79,12 +83,9 @@
   install=gvfs-module.install
 
   cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
-  install -m755 -d "${pkgdir}/usr/lib/gvfs"
-  install -m755 -d "${pkgdir}/usr/share/gvfs/mounts"
+  install -D .libs/gvfsd-gphoto2 "${pkgdir}/usr/lib/gvfs/gvfsd-gphoto2"
+  install -Dm644 gphoto2.mount "${pkgdir}/usr/share/gvfs/mounts/gphoto2.mount"
 
-  install -m755 .libs/gvfsd-gphoto2 "${pkgdir}/usr/lib/gvfs/"
-  install -m644 gphoto2.mount "${pkgdir}/usr/share/gvfs/mounts/"
-
   cd "${srcdir}/${pkgbase}-${pkgver}/monitor/gphoto2"
   make DESTDIR="${pkgdir}" install
 }
@@ -95,9 +96,6 @@
   install=gvfs-module.install
 
   cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
-  install -m755 -d "${pkgdir}/usr/lib/gvfs"
-  install -m755 -d "${pkgdir}/usr/share/gvfs/mounts"
-
-  install -m755 .libs/gvfsd-obexftp "${pkgdir}/usr/lib/gvfs/"
-  install -m644 obexftp.mount "${pkgdir}/usr/share/gvfs/mounts/"
+  install -D .libs/gvfsd-obexftp "${pkgdir}/usr/lib/gvfs/gvfsd-obexftp"
+  install -Dm644 obexftp.mount "${pkgdir}/usr/share/gvfs/mounts/obexftp.mount"
 }

Modified: gvfs.install
===================================================================
--- gvfs.install	2011-02-13 17:08:15 UTC (rev 109900)
+++ gvfs.install	2011-02-13 17:36:26 UTC (rev 109901)
@@ -10,4 +10,5 @@
 
 post_remove() {
   usr/bin/gio-querymodules usr/lib/gio/modules
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
 }