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

[Jan de Groot]

    Date: Friday, March 14, 2008 @ 17:49:52
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-utils

Modified: PKGBUILD (1.31 -> 1.32) gnome-utils.install (1.10 -> 1.11)

upgpkg: gnome-utils 2.20.0.1-3
    GNOME 2.22


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


Index: extra/gnome/gnome-utils/PKGBUILD
diff -u extra/gnome/gnome-utils/PKGBUILD:1.31 extra/gnome/gnome-utils/PKGBUILD:1.32
--- extra/gnome/gnome-utils/PKGBUILD:1.31	Wed Jan 16 17:10:23 2008
+++ extra/gnome/gnome-utils/PKGBUILD	Fri Mar 14 17:49:52 2008
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD,v 1.31 2008/01/16 22:10:23 jgc Exp $
+# $Id: PKGBUILD,v 1.32 2008/03/14 21:49:52 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-utils
 pkgver=2.20.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Common utilities for GNOME"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('libgtop>=2.20.1' 'libgnomeprintui>=2.18.1' 'gnome-panel>=2.20.3')
-makedepends=('perlxml' 'gnome-doc-utils>=0.12.0' 'pkgconfig')
+depends=('libgtop>=2.22.0' 'libgnomeprintui>=2.18.2' 'gnome-panel>=2.22.0')
+makedepends=('perlxml' 'gnome-doc-utils>=0.12.2' 'pkgconfig')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 groups=('gnome-extra')
 install=gnome-utils.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2
 	bgo497489.patch)
-md5sums=('2d4385df2fb566b437b283bd2ce70190')
+md5sums=('2d4385df2fb566b437b283bd2ce70190' '22922b4c54438b8808d5b942459da1db')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
@@ -23,11 +23,11 @@
   ./configure --prefix=/usr --sysconfdir=/etc \
               --libexecdir=/usr/lib/gnome-utils \
               --localstatedir=/var --disable-static \
-              --enable-hal --disable-scrollkeeper
+              --enable-hal --disable-scrollkeeper || 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/gnome-utils/gnome-utils.install
diff -u extra/gnome/gnome-utils/gnome-utils.install:1.10 extra/gnome/gnome-utils/gnome-utils.install:1.11
--- extra/gnome/gnome-utils/gnome-utils.install:1.10	Sun Sep 23 09:33:11 2007
+++ extra/gnome/gnome-utils/gnome-utils.install	Fri Mar 14 17:49:52 2008
@@ -20,8 +20,3 @@
 post_remove() {
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
-
-op=$1
-shift
-
-$op $*