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

[Jan de Groot]

    Date: Friday, March 14, 2008 @ 17:42:41
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gok

Modified: PKGBUILD (1.27 -> 1.28) gok.install (1.7 -> 1.8)

upgpkg: gok 1.3.7-2
    GNOME 2.22


-------------+
 PKGBUILD    |   16 ++++++++--------
 gok.install |    5 -----
 2 files changed, 8 insertions(+), 13 deletions(-)


Index: extra/gnome/gok/PKGBUILD
diff -u extra/gnome/gok/PKGBUILD:1.27 extra/gnome/gok/PKGBUILD:1.28
--- extra/gnome/gok/PKGBUILD:1.27	Fri Oct 19 17:02:13 2007
+++ extra/gnome/gok/PKGBUILD	Fri Mar 14 17:42:41 2008
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD,v 1.27 2007/10/19 21:02:13 jgc Exp $
+# $Id: PKGBUILD,v 1.28 2008/03/14 21:42:41 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gok
 pkgver=1.3.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Gnome Onscreen Keyboard"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.gnome.org"
-depends=('gnome-speech>=0.4.16' 'libgnomeui>=2.20.1' 'at-spi>=1.20.1' 'libwnck>=2.20.1')
-makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.12.0')
+depends=('gnome-speech>=0.4.18' 'libgnomeui>=2.22.01' 'at-spi>=1.22.0' 'libwnck>=2.22.0')
+makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.12.2')
 options=('!emptydirs')
 groups=('gnome-extra')
 install=gok.install
@@ -19,11 +19,11 @@
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var
+              --localstatedir=/var || return 1
   make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=$startdir/pkg install
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=$startdir/pkg install || return 1
 
-  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
+  install -m755 -d ${startdir}/pkg/usr/share/gconf/schemas
+  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas || return 1
   rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
 }
Index: extra/gnome/gok/gok.install
diff -u extra/gnome/gok/gok.install:1.7 extra/gnome/gok/gok.install:1.8
--- extra/gnome/gok/gok.install:1.7	Sun Sep 23 09:41:57 2007
+++ extra/gnome/gok/gok.install	Fri Mar 14 17:42:41 2008
@@ -15,8 +15,3 @@
 pre_remove() {
   usr/sbin/gconfpkg --uninstall ${pkgname}
 }
-
-op=$1
-shift
-
-$op $*