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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 11:19:59
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/deskbar-applet

Modified: PKGBUILD (1.17 -> 1.18) deskbar-applet.install (1.3 -> 1.4)

upgpkg: deskbar-applet 2.18.1-2
Add dbus-python dependency, move to /usr


------------------------+
 PKGBUILD               |   20 +++++++++-----------
 deskbar-applet.install |   12 +++++++-----
 2 files changed, 16 insertions(+), 16 deletions(-)


Index: extra/gnome/deskbar-applet/PKGBUILD
diff -u extra/gnome/deskbar-applet/PKGBUILD:1.17 extra/gnome/deskbar-applet/PKGBUILD:1.18
--- extra/gnome/deskbar-applet/PKGBUILD:1.17	Sun Apr  8 15:00:57 2007
+++ extra/gnome/deskbar-applet/PKGBUILD	Sun Apr 22 11:19:59 2007
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD,v 1.17 2007/04/08 19:00:57 jgc Exp $
+# $Id: PKGBUILD,v 1.18 2007/04/22 15:19:59 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=deskbar-applet
 pkgver=2.18.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An all-in-one search bar for the GNOME panel"
 arch=(i686 x86_64)
 url="http://raphael.slinckx.net/deskbar/"
 license=('GPL')
-depends=('gnome-desktop>=2.18.0' 'gnome-python-desktop>=2.18.0' 'gnome-panel>=2.18.0' 'libbonoboui>=2.18.0') 
-makedepends=('evolution-data-server>=1.10.0' 'xulrunner>=1.8.1' 'gettext' 'perlxml' 'pkgconfig' 'gnome-doc-utils')
+depends=('gnome-desktop>=2.18.1' 'gnome-python-desktop>=2.18.0' 'gnome-panel>=2.18.1' 'libbonoboui>=2.18.0-2' 'dbus-python>=0.80.1' 'scrollkeeper')
+makedepends=('evolution-data-server>=1.10.1-2' 'xulrunner>=1.8.1' 'gettext' 'perlxml' 'pkgconfig' 'gnome-doc-utils>=0.10.3')
 options=('nolibtool')
 install="deskbar-applet.install"
 source=(http://ftp.gnome.org/pub/GNOME/sources/deskbar-applet/2.18/${pkgname}-${pkgver}.tar.bz2)
@@ -17,7 +17,8 @@
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/opt/gnome \
+  ./configure --prefix=/usr --sysconfdir=/etc \
+    --localstatedir=/var \
     --disable-scrollkeeper \
     --enable-beagle \
     --enable-evolution
@@ -25,10 +26,7 @@
   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
-  mv ${startdir}/pkg/opt/gnome/share/icons ${startdir}/pkg/usr/share/
+  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/deskbar-applet/deskbar-applet.install
diff -u extra/gnome/deskbar-applet/deskbar-applet.install:1.3 extra/gnome/deskbar-applet/deskbar-applet.install:1.4
--- extra/gnome/deskbar-applet/deskbar-applet.install:1.3	Mon Mar 19 18:49:26 2007
+++ extra/gnome/deskbar-applet/deskbar-applet.install	Sun Apr 22 11:19:59 2007
@@ -1,8 +1,8 @@
 pkgname=deskbar-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
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
@@ -16,15 +16,17 @@
 }
 
 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 () {