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

[Jan de Groot]

    Date: Sunday, September 23, 2007 @ 09:04:17
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-system-monitor

Modified: PKGBUILD (1.29 -> 1.30) gnome-system-monitor.install (1.9 -> 1.10)

upgpkg: gnome-system-monitor 2.20.0-1
GNOME 2.20


------------------------------+
 PKGBUILD                     |   25 +++++++++++--------------
 gnome-system-monitor.install |   19 ++-----------------
 2 files changed, 13 insertions(+), 31 deletions(-)


Index: extra/gnome/gnome-system-monitor/PKGBUILD
diff -u extra/gnome/gnome-system-monitor/PKGBUILD:1.29 extra/gnome/gnome-system-monitor/PKGBUILD:1.30
--- extra/gnome/gnome-system-monitor/PKGBUILD:1.29	Fri Jun  1 05:17:27 2007
+++ extra/gnome/gnome-system-monitor/PKGBUILD	Sun Sep 23 09:04:17 2007
@@ -1,29 +1,27 @@
-# $Id: PKGBUILD,v 1.29 2007/06/01 09:17:27 jgc Exp $
+# $Id: PKGBUILD,v 1.30 2007/09/23 13:04:17 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-system-monitor
-pkgver=2.18.2
+pkgver=2.20.0
 pkgrel=1
 pkgdesc="A system monitor for GNOME"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 license=('GPL')
-depends=('libgksu>=2.0.3' 'libwnck>=2.18.2' 'gnome-vfs>=2.18.1' 'libgtop>=2.14.8-2' 'scrollkeeper')
-makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.10.3')
+depends=('libgksu>=2.0.5' 'libwnck>=2.20.0' 'gnome-vfs>=2.20.0' 'libgtop>=2.20.0' 'gtkmm>=2.12.0')
+makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.12.0' 'intltool')
+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.18/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('860047e636522af2c068dddb5df883bd')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('52d02162cecd0174536148197024126d')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  find . -name Makefile.in -exec sed -i -e 's/-scrollkeeper-update.*//' {} \;
-  if [ -f omf.make ]; then
-    sed -i -e 's/-scrollkeeper-update.*//' omf.make
-  fi
-
+  intltoolize -f
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-scrollkeeper
+              --localstatedir=/var --disable-scrollkeeper \
+	      --enable-pcrecpp
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
 
@@ -31,4 +29,3 @@
   gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas
   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.9 extra/gnome/gnome-system-monitor/gnome-system-monitor.install:1.10
--- extra/gnome/gnome-system-monitor/gnome-system-monitor.install:1.9	Sun Apr 22 11:05:26 2007
+++ extra/gnome/gnome-system-monitor/gnome-system-monitor.install	Sun Sep 23 09:04:17 2007
@@ -1,9 +1,7 @@
 pkgname=gnome-system-monitor
 
 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