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

[Jan de Groot]

    Date: Saturday, September 22, 2007 @ 18:23:45
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gcalctool

Modified: PKGBUILD (1.30 -> 1.31) gcalctool.install (1.9 -> 1.10)

upgpkg: gcalctool 5.20.0-1
GNOME 2.20


-------------------+
 PKGBUILD          |   22 +++++++++-------------
 gcalctool.install |   19 ++-----------------
 2 files changed, 11 insertions(+), 30 deletions(-)


Index: extra/gnome/gcalctool/PKGBUILD
diff -u extra/gnome/gcalctool/PKGBUILD:1.30 extra/gnome/gcalctool/PKGBUILD:1.31
--- extra/gnome/gcalctool/PKGBUILD:1.30	Sun Apr 22 12:26:19 2007
+++ extra/gnome/gcalctool/PKGBUILD	Sat Sep 22 18:23:45 2007
@@ -1,31 +1,27 @@
-# $Id: PKGBUILD,v 1.30 2007/04/22 16:26:19 jgc Exp $
+# $Id: PKGBUILD,v 1.31 2007/09/22 22:23:45 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gcalctool
-pkgver=5.9.14
-pkgrel=2
+pkgver=5.20.0
+pkgrel=1
 pkgdesc="GNOME Scientific calculator"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('libgnomeui>=2.18.1-2' 'scrollkeeper')
-makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils')
+depends=('gconf>=2.20.0')
+makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.12.0')
 groups=('gnome-extra')
+options=(!emptydirs)
 url="http://www.gnome.org"
 install=gcalctool.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/5.9/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('dd51bc2fa9e53a3b6d7b3264e1059296')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/5.20/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('fefe44a52465eae39c5bf9a9669a0aa6')
 	
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  if [ -f omf.make ]; then
-    find . -name Makefile.in -exec sed -i -e 's/-scrollkeeper-update.*//' {} \;
-    sed -i -e 's/-scrollkeeper-update.*//' omf.make
-  fi
-
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-scrollkeeper
   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
Index: extra/gnome/gcalctool/gcalctool.install
diff -u extra/gnome/gcalctool/gcalctool.install:1.9 extra/gnome/gcalctool/gcalctool.install:1.10
--- extra/gnome/gcalctool/gcalctool.install:1.9	Sun Apr 22 12:26:19 2007
+++ extra/gnome/gcalctool/gcalctool.install	Sat Sep 22 18:23:45 2007
@@ -1,9 +1,7 @@
 pkgname=gcalctool
 
 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