[arch-commits] CVS update of extra/gnome/gnome-volume-manager (2 files)

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 12:12:32
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-volume-manager

Modified: PKGBUILD (1.21 -> 1.22) gnome-volume-manager.install (1.7 -> 1.8)

upgpkg: gnome-volume-manager 2.17.0-2
Move to /usr


------------------------------+
 PKGBUILD                     |   27 +++++++++++++--------------
 gnome-volume-manager.install |   17 +++++++----------
 2 files changed, 20 insertions(+), 24 deletions(-)


Index: extra/gnome/gnome-volume-manager/PKGBUILD
diff -u extra/gnome/gnome-volume-manager/PKGBUILD:1.21 extra/gnome/gnome-volume-manager/PKGBUILD:1.22
--- extra/gnome/gnome-volume-manager/PKGBUILD:1.21	Wed Mar 21 14:45:57 2007
+++ extra/gnome/gnome-volume-manager/PKGBUILD	Sun Apr 22 12:12:32 2007
@@ -1,32 +1,31 @@
-# $Id: PKGBUILD,v 1.21 2007/03/21 18:45:57 jgc Exp $
-# Maintainer: Arjan Timmerman <arjan at soulfly.nl>
+# $Id: PKGBUILD,v 1.22 2007/04/22 16:12:32 jgc Exp $
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Link Dupont <link at subpop.net>
 
 pkgname=gnome-volume-manager
 pkgver=2.17.0
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME daemon to auto-mount and manage media devices"
 arch=(i686 x86_64)
+license=('GPL')
 url=http://www.gnome.org/
-depends=('libgnomeui>=2.18.1' 'libnotify>=0.4.3' 'gnome-mount')
-makedepends=('nautilus>=2.18.0' 'perlxml' 'pkgconfig')
+depends=('libgnomeui>=2.18.1-2' 'libnotify>=0.4.4' 'gnome-mount>=0.6')
+makedepends=('nautilus>=2.18.1' 'perlxml' 'pkgconfig')
+install=gnome-volume-manager.install
+groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.17/${pkgname}-${pkgver}.tar.bz2
 	gvm-mount-async.patch)
-install=gnome-volume-manager.install
-groups=(gnome-extra)
 md5sums=('104cec26e721e0bba69debd392367195' '534b8b9633148bd975b2b9b518c41fb4')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
-
   cd ${startdir}/src/${pkgname}-${pkgver}
   patch -Np0 -i ${startdir}/src/gvm-mount-async.patch || return 1
-  ./configure --prefix=/opt/gnome
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var
   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-volume-manager/gnome-volume-manager.install
diff -u extra/gnome/gnome-volume-manager/gnome-volume-manager.install:1.7 extra/gnome/gnome-volume-manager/gnome-volume-manager.install:1.8
--- extra/gnome/gnome-volume-manager/gnome-volume-manager.install:1.7	Sun Mar 19 07:28:43 2006
+++ extra/gnome/gnome-volume-manager/gnome-volume-manager.install	Sun Apr 22 12:12:32 2007
@@ -1,9 +1,8 @@
 pkgname=gnome-volume-manager
 
 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
-  update-desktop-database -q
+  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() {
@@ -15,18 +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
-}
-
-post_remove() {
-  update-desktop-database -q
+  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
 }
 
 op=$1