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

[Jan de Groot]

    Date: Sunday, September 23, 2007 @ 09:41:57
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gok

Modified: PKGBUILD (1.25 -> 1.26) gok.install (1.6 -> 1.7)

upgpkg: gok 1.3.4-1
GNOME 2.20


-------------+
 PKGBUILD    |   17 +++++++----------
 gok.install |   19 ++-----------------
 2 files changed, 9 insertions(+), 27 deletions(-)


Index: extra/gnome/gok/PKGBUILD
diff -u extra/gnome/gok/PKGBUILD:1.25 extra/gnome/gok/PKGBUILD:1.26
--- extra/gnome/gok/PKGBUILD:1.25	Sun May 27 09:29:35 2007
+++ extra/gnome/gok/PKGBUILD	Sun Sep 23 09:41:57 2007
@@ -1,26 +1,23 @@
-# $Id: PKGBUILD,v 1.25 2007/05/27 13:29:35 jgc Exp $
+# $Id: PKGBUILD,v 1.26 2007/09/23 13:41:57 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gok
-pkgver=1.2.5
+pkgver=1.3.4
 pkgrel=1
 pkgdesc="Gnome Onscreen Keyboard"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.gnome.org"
-depends=('gnome-speech>=0.4.11-2' 'libgnomeui>=2.18.1-2' 'at-spi>=1.18.1-2' 'libwnck>=2.18.0-2' 'gail>=1.18.0-2' 'scrollkeeper')
-makedepends=('perlxml' 'pkgconfig')
+depends=('gnome-speech>=0.4.16' 'libgnomeui>=2.20.0' 'at-spi>=1.20.0' 'libwnck>=2.20.0')
+makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.12.0')
+options=('!emptydirs')
 groups=('gnome-extra')
 install=gok.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.2/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('2ef1f171385a37f93408dbca7ecfdf11')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.3/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('b304eb500800c0b359d2e3c361be5282')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  if [ -f omf.make ]; then
-    find . -name Makefile.in -exec sed -i -e 's/-scrollkeeper-update.*//' {} \;
-    sed -i -e 's/-scrollkeeper-update.*//' omf.make
-  fi
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var
   make || return 1
Index: extra/gnome/gok/gok.install
diff -u extra/gnome/gok/gok.install:1.6 extra/gnome/gok/gok.install:1.7
--- extra/gnome/gok/gok.install:1.6	Sun Apr 22 12:12:12 2007
+++ extra/gnome/gok/gok.install	Sun Sep 23 09:41:57 2007
@@ -1,9 +1,7 @@
 pkgname=gok
 
 post_install() {
-  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
+  usr/sbin/gconfpkg --install ${pkgname}
 }
 
 pre_upgrade() {
@@ -15,20 +13,7 @@
 }
 
 pre_remove() {
-  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=`usr/bin/gconftool-2 --get-default-source`
-  
-  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
-}
-
-post_remove() {
-  scrollkeeper-update -q -p var/lib/scrollkeeper
+  usr/sbin/gconfpkg --uninstall ${pkgname}
 }
 
 op=$1