[arch-commits] CVS update of extra/gnome/fast-user-switch-applet (2 files)

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 12:25:54
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/fast-user-switch-applet

Modified: PKGBUILD (1.8 -> 1.9) fusa.install (1.2 -> 1.3)

upgpkg: fast-user-switch-applet 2.18.0-2
Move to /usr


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


Index: extra/gnome/fast-user-switch-applet/PKGBUILD
diff -u extra/gnome/fast-user-switch-applet/PKGBUILD:1.8 extra/gnome/fast-user-switch-applet/PKGBUILD:1.9
--- extra/gnome/fast-user-switch-applet/PKGBUILD:1.8	Mon Apr  9 14:05:22 2007
+++ extra/gnome/fast-user-switch-applet/PKGBUILD	Sun Apr 22 12:25:54 2007
@@ -1,32 +1,31 @@
-# $Id: PKGBUILD,v 1.8 2007/04/09 18:05:22 jgc Exp $
+# $Id: PKGBUILD,v 1.9 2007/04/22 16:25:54 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Mark Rosenstand <mark at borkware.net>
 
 pkgname=fast-user-switch-applet
 pkgver=2.18.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An applet for the GNOME panel which provides a menu to switch between users."
 arch=(i686 x86_64)
+license=('GPL')
 url="http://ignore-your.tv/fusa/"
-license=(GPL)
-depends=('gnome-panel>=2.18.0' 'libxmu')
+depends=('gnome-panel>=2.18.1' 'libxmu')
 makedepends=('perlxml' 'pkgconfig')
 install=fusa.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/fast-user-switch-applet/2.18/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('aefe9ea3aecc908336ae909aeee385b5')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
-
   cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/opt/gnome \
-    --disable-scrollkeeper \
-    --with-gdm-setup=/opt/gnome/sbin/gdmsetup \
-    --with-gdm-config=/opt/gnome/etc/gdm/custom.conf
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --libexecdir=/usr/lib/fast-user-switch-applet \
+              --localstatedir=/var --disable-scrollkeeper \
+              --with-gdm-setup=/usr/sbin/gdmsetup \
+              --with-gdm-config=/etc/gdm/custom.conf
   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/fast-user-switch-applet/fusa.install
diff -u extra/gnome/fast-user-switch-applet/fusa.install:1.2 extra/gnome/fast-user-switch-applet/fusa.install:1.3
--- extra/gnome/fast-user-switch-applet/fusa.install:1.2	Thu Sep 28 15:41:39 2006
+++ extra/gnome/fast-user-switch-applet/fusa.install	Sun Apr 22 12:25:54 2007
@@ -1,8 +1,8 @@
 pkgname=fast-user-switch-applet
 
 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
   scrollkeeper-update -q -p var/lib/scrollkeeper
 }
 
@@ -15,14 +15,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
 }
 
 post_remove() {