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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 11:16:11
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-mount

Modified: PKGBUILD (1.3 -> 1.4) gnome-mount.install (1.1 -> 1.2)

upgpkg: gnome-mount 0.6-1
Move to /usr


---------------------+
 PKGBUILD            |   25 +++++++++++++------------
 gnome-mount.install |   12 +++++++-----
 2 files changed, 20 insertions(+), 17 deletions(-)


Index: extra/gnome/gnome-mount/PKGBUILD
diff -u extra/gnome/gnome-mount/PKGBUILD:1.3 extra/gnome/gnome-mount/PKGBUILD:1.4
--- extra/gnome/gnome-mount/PKGBUILD:1.3	Sun Oct 29 15:36:40 2006
+++ extra/gnome/gnome-mount/PKGBUILD	Sun Apr 22 11:16:11 2007
@@ -1,29 +1,30 @@
-#$Id: PKGBUILD,v 1.3 2006/10/29 20:36:40 andyrtr Exp $
+#$Id: PKGBUILD,v 1.4 2007/04/22 15:16:11 jgc Exp $
 # Maintainer: Jan de Groot <jgc at arclinux.org>
 
 pkgname=gnome-mount
-pkgver=0.5
+pkgver=0.6
 pkgrel=1
 pkgdesc="GNOME mount program"
 arch=(i686 x86_64)
+license=('GPL')
 url="http://people.freedesktop.org/~david/dist/"
-license=""
-depends=('gail' 'libgnomeui' 'libnotify')
-makedepends=('pkgconfig' 'intltool' 'nautilus')
+depends=('hal>=0.5.9' 'gnome-keyring>=0.8.1-2' 'gconf>=2.18.0.1-2'
+         'libnotify>=0.4.4')
+makedepends=('pkgconfig' 'perlxml' 'nautilus>=2.18.1')
+options=('nolibtool')
 groups=('gnome')
 install=gnome-mount.install
 source=(http://people.freedesktop.org/~david/dist/${pkgname}-${pkgver}.tar.gz)
-md5sums=('76622ff9af0131fc44687aed7204f84f')
+md5sums=('d2612aecfa73806e072316033d78b203')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/opt/gnome
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var --disable-static
   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
-
-  rm -f ${startdir}/pkg/opt/gnome/lib/nautilus/extensions-1.0/*.{a,la}
+  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-mount/gnome-mount.install
diff -u extra/gnome/gnome-mount/gnome-mount.install:1.1 extra/gnome/gnome-mount/gnome-mount.install:1.2
--- extra/gnome/gnome-mount/gnome-mount.install:1.1	Sat Oct 14 15:13:07 2006
+++ extra/gnome/gnome-mount/gnome-mount.install	Sun Apr 22 11:16:11 2007
@@ -1,8 +1,8 @@
 pkgname=gnome-mount
 
 post_install() {
-  export 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
+  export 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
-  export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
+  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
   
-  opt/gnome/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
 }
 
 op=$1