[arch-commits] CVS update of extra/gnome/gnome-system-monitor (2 files)

[Jan de Groot]

    Date: Sunday, March 16, 2008 @ 09:52:43
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-system-monitor

Modified: PKGBUILD (1.32 -> 1.33) gnome-system-monitor.install (1.10 -> 1.11)

upgpkg: gnome-system-monitor 2.22.0-1
    GNOME 2.22


------------------------------+
 PKGBUILD                     |   20 ++++++++++----------
 gnome-system-monitor.install |    5 -----
 2 files changed, 10 insertions(+), 15 deletions(-)


Index: extra/gnome/gnome-system-monitor/PKGBUILD
diff -u extra/gnome/gnome-system-monitor/PKGBUILD:1.32 extra/gnome/gnome-system-monitor/PKGBUILD:1.33
--- extra/gnome/gnome-system-monitor/PKGBUILD:1.32	Thu Jan 10 15:46:31 2008
+++ extra/gnome/gnome-system-monitor/PKGBUILD	Sun Mar 16 09:52:43 2008
@@ -1,30 +1,30 @@
-# $Id: PKGBUILD,v 1.32 2008/01/10 20:46:31 jgc Exp $
+# $Id: PKGBUILD,v 1.33 2008/03/16 13:52:43 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-system-monitor
-pkgver=2.20.2
+pkgver=2.22.0
 pkgrel=1
 pkgdesc="A system monitor for GNOME"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('libgksu>=2.0.5' 'libwnck>=2.20.2' 'gnome-vfs>=2.20.0' 'libgtop>=2.20.1' 'gtkmm>=2.12.1')
-makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.12.0')
+depends=('libgksu>=2.0.5' 'libwnck>=2.22.0' 'gnome-vfs>=2.22.0' 'libgtop>=2.22.0' 'gtkmm>=2.12.5' 'librsvg>=2.22.1')
+makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.12.2')
 options=(!emptydirs)
 url="http://www.gnome.org"
 groups=('gnome-extra')
 install=gnome-system-monitor.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('d5e52f923b0b725b3a49e4bb7a296436')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.22/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('7b809a4db72902ca5f47a63f62917d14')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-scrollkeeper \
-	      --enable-pcrecpp
+	      --enable-pcrecpp || 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-system-monitor/gnome-system-monitor.install
diff -u extra/gnome/gnome-system-monitor/gnome-system-monitor.install:1.10 extra/gnome/gnome-system-monitor/gnome-system-monitor.install:1.11
--- extra/gnome/gnome-system-monitor/gnome-system-monitor.install:1.10	Sun Sep 23 09:04:17 2007
+++ extra/gnome/gnome-system-monitor/gnome-system-monitor.install	Sun Mar 16 09:52:43 2008
@@ -15,8 +15,3 @@
 pre_remove() {
   usr/sbin/gconfpkg --uninstall ${pkgname}
 }
-
-op=$1
-shift
-
-$op $*