[arch-commits] CVS update of extra/gnome/gnome-vfs (PKGBUILD gnome-vfs.install)

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 09:55:08
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-vfs

Modified: PKGBUILD (1.47 -> 1.48) gnome-vfs.install (1.9 -> 1.10)

upgpkg: gnome-vfs 2.18.1-1
Move to /usr


-------------------+
 PKGBUILD          |   25 ++++++++++++-------------
 gnome-vfs.install |   12 +++++++-----
 2 files changed, 19 insertions(+), 18 deletions(-)


Index: extra/gnome/gnome-vfs/PKGBUILD
diff -u extra/gnome/gnome-vfs/PKGBUILD:1.47 extra/gnome/gnome-vfs/PKGBUILD:1.48
--- extra/gnome/gnome-vfs/PKGBUILD:1.47	Mon Mar 19 13:48:30 2007
+++ extra/gnome/gnome-vfs/PKGBUILD	Sun Apr 22 09:55:07 2007
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD,v 1.47 2007/03/19 17:48:30 jgc Exp $
-# Maintainer: arjan <arjan at archlinux.org>
-# 	      Jan de Groot <jgc at archlinux.org>
+# $Id: PKGBUILD,v 1.48 2007/04/22 13:55:07 jgc Exp $
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-vfs
-pkgver=2.18.0.1
+pkgver=2.18.1
 pkgrel=1
 pkgdesc="The GNOME Virtual File System"
 arch=(i686 x86_64)
 license=(GPL)
-depends=('fam' 'gconf>=2.18.0.1' 'hal>=0.5.8.1-6' 'bzip2' 'avahi>=0.6.17' 'smbclient>=3.0.24-2' 'acl')
-makedepends=('perlxml' 'pkgconfig' 'kernel-headers' 'gnome-mime-data')
+depends=('fam' 'gconf>=2.18.0.1-2' 'hal>=0.5.9' 'bzip2' 'avahi>=0.6.17' 'smbclient>=3.0.24-2' 'acl' 'gnome-mime-data>=2.18.0-2')
+makedepends=('perlxml' 'pkgconfig')
 options=('nolibtool')
 conflicts=(gnome-vfs-samba)
 provides=(gnome-vfs-samba)
@@ -19,12 +18,10 @@
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/gnome-vfs-${pkgver}.tar.bz2
 	gnome-vfs-2.15.1-use-sys-inotify.patch
 	hal-show-volume-names.patch)
-md5sums=('0b7a6ab495c0d94c3db00a7b0321adbf' '167b74db0622d5057114f62f020aad39'\
+md5sums=('bf4a6d95180d05981893e5d021c6695c' '167b74db0622d5057114f62f020aad39'\
          '109d07aa1dc8cb6523c47c4984047dce')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
-
   cd ${startdir}/src/${pkgname}-${pkgver}
   #Redhat patches
   patch -Np1 -i ${startdir}/src/gnome-vfs-2.15.1-use-sys-inotify.patch || return 1
@@ -32,14 +29,16 @@
   #Archlinux patch (b.g.o #321498)
   patch -Np1 -i ${startdir}/src/hal-show-volume-names.patch || return 1
 
-  ./configure --prefix=/opt/gnome \
+  ./configure --prefix=/usr --sysconfdir=/etc \
+        --localstatedir=/var --disable-static \
+	--libexecdir=/usr/lib/gnome-vfs-2.0 \
   	--enable-samba --enable-hal \
         --enable-avahi --disable-howl \
 	--disable-openssl --enable-gnutls
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
 
-  mkdir -p ${startdir}/pkg/opt/gnome/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/opt/gnome/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/opt/gnome/etc/gconf/schemas/*.schemas
-  rm -f ${startdir}/pkg/opt/gnome/etc/gconf/schemas/*.schemas
+  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
 }
Index: extra/gnome/gnome-vfs/gnome-vfs.install
diff -u extra/gnome/gnome-vfs/gnome-vfs.install:1.9 extra/gnome/gnome-vfs/gnome-vfs.install:1.10
--- extra/gnome/gnome-vfs/gnome-vfs.install:1.9	Sun Mar 19 07:28:00 2006
+++ extra/gnome/gnome-vfs/gnome-vfs.install	Sun Apr 22 09:55:08 2007
@@ -1,8 +1,8 @@
 pkgname=gnome-vfs
 
 post_install() {
-  GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source` \
-    opt/gnome/bin/gconftool-2 --makefile-install-rule opt/gnome/share/gconf/schemas/${pkgname}.schemas >/dev/null
+  GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source` \
+    usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/${pkgname}.schemas >/dev/null
 }
 
 pre_upgrade() {
@@ -14,14 +14,16 @@
 }
 
 pre_remove() {
-  if [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
+  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
+    schemas=(usr/share/gconf/schemas/${pkgname}.schemas)
+  elif [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
     schemas=(opt/gnome/share/gconf/schemas/${pkgname}.schemas)
   else
     schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
   fi
 
-  GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source` \
-    opt/gnome/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+  GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source` \
+    usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
 }
 
 op=$1