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

[Jan de Groot]

    Date: Friday, March 14, 2008 @ 13:57:04
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gcalctool

Modified: PKGBUILD (1.32 -> 1.33) gcalctool.install (1.10 -> 1.11)

upgpkg: gcalctool 5.22.0-1
    GNOME 2.22


-------------------+
 PKGBUILD          |   18 +++++++++---------
 gcalctool.install |    5 -----
 2 files changed, 9 insertions(+), 14 deletions(-)


Index: extra/gnome/gcalctool/PKGBUILD
diff -u extra/gnome/gcalctool/PKGBUILD:1.32 extra/gnome/gcalctool/PKGBUILD:1.33
--- extra/gnome/gcalctool/PKGBUILD:1.32	Fri Oct 19 16:55:25 2007
+++ extra/gnome/gcalctool/PKGBUILD	Fri Mar 14 13:57:04 2008
@@ -1,29 +1,29 @@
-# $Id: PKGBUILD,v 1.32 2007/10/19 20:55:25 jgc Exp $
+# $Id: PKGBUILD,v 1.33 2008/03/14 17:57:04 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gcalctool
-pkgver=5.20.2
+pkgver=5.22.0
 pkgrel=1
 pkgdesc="GNOME Scientific calculator"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('gconf>=2.20.1')
-makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.12.0')
+depends=('gconf>=2.22.0' 'libglade>=2.6.2')
+makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.12.2')
 groups=('gnome-extra')
 options=(!emptydirs)
 url="http://www.gnome.org"
 install=gcalctool.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/5.20/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('bcde10b8029d3a513183e8aac9506c1f')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/5.22/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('037ef812fe5562b4dda55b9eea82b77b')
 	
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-scrollkeeper
+              --localstatedir=/var --disable-scrollkeeper || return 1
   make || return 1
   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/gcalctool/gcalctool.install
diff -u extra/gnome/gcalctool/gcalctool.install:1.10 extra/gnome/gcalctool/gcalctool.install:1.11
--- extra/gnome/gcalctool/gcalctool.install:1.10	Sat Sep 22 18:23:45 2007
+++ extra/gnome/gcalctool/gcalctool.install	Fri Mar 14 13:57:04 2008
@@ -15,8 +15,3 @@
 pre_remove() {
   usr/sbin/gconfpkg --uninstall ${pkgname}
 }
-
-op=$1
-shift
-
-$op $*