[arch-commits] Commit in gnome-system-monitor/trunk (2 files)

[Ionut Biru]

    Date: Sunday, February 27, 2011 @ 15:51:33
  Author: ibiru
Revision: 111620

upgpkg: gnome-system-monitor 2.99.0-1
update to 2.99

Modified:
  gnome-system-monitor/trunk/PKGBUILD
  gnome-system-monitor/trunk/gnome-system-monitor.install

------------------------------+
 PKGBUILD                     |   18 +++++++++---------
 gnome-system-monitor.install |   12 +++++++-----
 2 files changed, 16 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-02-27 20:48:57 UTC (rev 111619)
+++ PKGBUILD	2011-02-27 20:51:33 UTC (rev 111620)
@@ -2,28 +2,28 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-system-monitor
-pkgver=2.28.2
+pkgver=2.99.0
 pkgrel=1
 pkgdesc="A system monitor for GNOME"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('libgksu>=2.0.5' 'libwnck>=2.30.5' 'gconf>=2.32.0' 'libgtop>=2.28.2' 'gtkmm>=2.20.' 'librsvg>=2.32.0' 'gnome-icon-theme>=2.31.0')
-makedepends=('pkgconfig' 'gnome-doc-utils>=0.20.0' 'intltool')
+depends=('libwnck3' 'libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme')
+makedepends=('pkgconfig' 'gnome-doc-utils' '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.28/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('b628edfd39e3a6b374ce133f367d3568475eb4e981a367f4f9d62a9784e5ae59')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.99/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('922705142f3b2112ab63bc9d113a5259ba56fb3c7e488a9811917b68afcb298f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-scrollkeeper
   make
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+}
 
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }

Modified: gnome-system-monitor.install
===================================================================
--- gnome-system-monitor.install	2011-02-27 20:48:57 UTC (rev 111619)
+++ gnome-system-monitor.install	2011-02-27 20:51:33 UTC (rev 111620)
@@ -1,17 +1,19 @@
 pkgname=gnome-system-monitor
 
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
+    glib-compile-schemas usr/share/glib-2.0/schemas
 }
 
 pre_upgrade() {
-  pre_remove $1
+    if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
+        usr/sbin/gconfpkg --uninstall ${pkgname}
+    fi
 }
 
 post_upgrade() {
-  post_install $1
+    post_install $1
 }
 
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
+post_remove() {
+    post_install $1
 }