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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 11:05:26
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-system-monitor

Modified: PKGBUILD (1.27 -> 1.28) gnome-system-monitor.install (1.8 -> 1.9)

upgpkg: gnome-system-monitor 2.18.1.1-1
Move to /usr


------------------------------+
 PKGBUILD                     |   23 ++++++++++-------------
 gnome-system-monitor.install |   14 +++++++-------
 2 files changed, 17 insertions(+), 20 deletions(-)


Index: extra/gnome/gnome-system-monitor/PKGBUILD
diff -u extra/gnome/gnome-system-monitor/PKGBUILD:1.27 extra/gnome/gnome-system-monitor/PKGBUILD:1.28
--- extra/gnome/gnome-system-monitor/PKGBUILD:1.27	Mon Apr  9 13:56:16 2007
+++ extra/gnome/gnome-system-monitor/PKGBUILD	Sun Apr 22 11:05:26 2007
@@ -1,37 +1,34 @@
-# $Id: PKGBUILD,v 1.27 2007/04/09 17:56:16 jgc Exp $
+# $Id: PKGBUILD,v 1.28 2007/04/22 15:05:26 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-system-monitor
-pkgver=2.18.1
+pkgver=2.18.1.1
 pkgrel=1
 pkgdesc="A system monitor for GNOME"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('libgksu>=2.0.3' 'libwnck>=2.18.0' 'gnome-vfs>=2.18.0' 'libgtop>=2.14.8')
-makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils')
+depends=('libgksu>=2.0.3' 'libwnck>=2.18.0-2' 'gnome-vfs>=2.18.1' 'libgtop>=2.14.8-2' 'scrollkeeper')
+makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.10.3')
 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=('35ddbe97e0de926e0b01a84c9e30641d')
+md5sums=('60215395ab7ea0b9d52ee021988b87d7')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
-
   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
 
-  ./configure --prefix=/opt/gnome --disable-scrollkeeper
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var --disable-scrollkeeper
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
 
-  mkdir -p ${startdir}/pkg/opt/gnome/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/opt/gnome/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/opt/gnome/etc/gconf/schemas/*.schemas
-  rm -f ${startdir}/pkg/opt/gnome/etc/gconf/schemas/*.schemas
-      
+  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
+  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.8 extra/gnome/gnome-system-monitor/gnome-system-monitor.install:1.9
--- extra/gnome/gnome-system-monitor/gnome-system-monitor.install:1.8	Sun Mar 19 07:24:18 2006
+++ extra/gnome/gnome-system-monitor/gnome-system-monitor.install	Sun Apr 22 11:05:26 2007
@@ -1,10 +1,9 @@
 pkgname=gnome-system-monitor
 
 post_install() {
-  export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
-  opt/gnome/bin/gconftool-2 --makefile-install-rule opt/gnome/share/gconf/schemas/${pkgname}.schemas >/dev/null
+  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
-  update-desktop-database -q
 }
 
 pre_upgrade() {
@@ -16,18 +15,19 @@
 }
 
 pre_remove() {
-  if [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
+  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=`opt/gnome/bin/gconftool-2 --get-default-source`
+  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
   
-  opt/gnome/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
 }
 
 post_remove() {
-  update-desktop-database -q
   scrollkeeper-update -q -p var/lib/scrollkeeper
 }