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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 11:35:00
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/dasher

Modified: PKGBUILD (1.19 -> 1.20) dasher.install (1.6 -> 1.7)

upgpkg: dasher 4.4.1-2
Move to /usr


----------------+
 PKGBUILD       |   29 ++++++++++-------------------
 dasher.install |   14 +++++++-------
 2 files changed, 17 insertions(+), 26 deletions(-)


Index: extra/gnome/dasher/PKGBUILD
diff -u extra/gnome/dasher/PKGBUILD:1.19 extra/gnome/dasher/PKGBUILD:1.20
--- extra/gnome/dasher/PKGBUILD:1.19	Sun Apr  8 14:28:57 2007
+++ extra/gnome/dasher/PKGBUILD	Sun Apr 22 11:35:00 2007
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD,v 1.19 2007/04/08 18:28:57 jgc Exp $
+# $Id: PKGBUILD,v 1.20 2007/04/22 15:35:00 jgc Exp $
 # Maintainer: damir <damir at archlinux.org>
 
 pkgname=dasher
 pkgver=4.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Information-efficient text-entry interface, driven by natural continuous pointing gestures"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('at-spi>=1.18.0' 'libgnomeui>=2.18.0' 'gnome-speech>=0.4.10')
-makedepends=('pkgconfig')
+depends=('at-spi>=1.18.1-2' 'libgnomeui>=2.18.1-2' 'gnome-speech>=0.4.11-2' 'scrollkeeper')
+makedepends=('pkgconfig' 'perlxml' 'gnome-doc-utils>=0.10.3')
 url="http://www.gnome.org"
 groups=('gnome-extra')
 install=dasher.install
@@ -16,23 +16,14 @@
 md5sums=('31308ce9747d5de0fa79ddd6a52bb2d9')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
-  # do not use distcc, it will break
-  export CC="gcc"
-  export CXX="g++"
   cd ${startdir}/src/${pkgname}-${pkgver}
-  find . -name Makefile.in -exec sed -i -e 's/-scrollkeeper-update.*//' {} \;
-  if [ -f omf.make ]; then
-    sed -i -e 's/-scrollkeeper-update.*//' omf.make
-  fi
-  ./configure --prefix=/opt/gnome --disable-scrollkeeper --enable-speech
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var \
+	      --disable-scrollkeeper --enable-speech
   make LDFLAGS+=-Wl,--export-dynamic || 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/dasher/dasher.install
diff -u extra/gnome/dasher/dasher.install:1.6 extra/gnome/dasher/dasher.install:1.7
--- extra/gnome/dasher/dasher.install:1.6	Fri Feb  2 12:48:16 2007
+++ extra/gnome/dasher/dasher.install	Sun Apr 22 11:35:00 2007
@@ -1,10 +1,9 @@
 pkgname=dasher
 
 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
-  update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
@@ -17,18 +16,19 @@
 }
 
 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() {
-  update-desktop-database -q
   scrollkeeper-update -q -p var/lib/scrollkeeper
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }