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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 12:26:19
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gcalctool

Modified: PKGBUILD (1.29 -> 1.30) gcalctool.install (1.8 -> 1.9)

upgpkg: gcalctool 5.9.14-2
Move to /usr


-------------------+
 PKGBUILD          |   25 ++++++++++++-------------
 gcalctool.install |   14 +++++++-------
 2 files changed, 19 insertions(+), 20 deletions(-)


Index: extra/gnome/gcalctool/PKGBUILD
diff -u extra/gnome/gcalctool/PKGBUILD:1.29 extra/gnome/gcalctool/PKGBUILD:1.30
--- extra/gnome/gcalctool/PKGBUILD:1.29	Tue Mar 20 12:52:31 2007
+++ extra/gnome/gcalctool/PKGBUILD	Sun Apr 22 12:26:19 2007
@@ -1,34 +1,33 @@
-# $Id: PKGBUILD,v 1.29 2007/03/20 16:52:31 jgc Exp $
-# Maintainer: arjan Timmerman <arjan at soulfly.nl>
+# $Id: PKGBUILD,v 1.30 2007/04/22 16:26:19 jgc Exp $
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gcalctool
 pkgver=5.9.14
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME Scientific calculator"
 arch=(i686 x86_64)
-depends=('libgnomeui>=2.18.1')
-makedepends=('perlxml' 'pkgconfig')
+license=('GPL')
+depends=('libgnomeui>=2.18.1-2' 'scrollkeeper')
+makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils')
 groups=('gnome-extra')
 url="http://www.gnome.org"
-license=(GPL)
 install=gcalctool.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/5.9/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('dd51bc2fa9e53a3b6d7b3264e1059296')
 	
 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
+    find . -name Makefile.in -exec sed -i -e 's/-scrollkeeper-update.*//' {} \;
     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/gcalctool/gcalctool.install
diff -u extra/gnome/gcalctool/gcalctool.install:1.8 extra/gnome/gcalctool/gcalctool.install:1.9
--- extra/gnome/gcalctool/gcalctool.install:1.8	Sat Oct 14 16:10:16 2006
+++ extra/gnome/gcalctool/gcalctool.install	Sun Apr 22 12:26:19 2007
@@ -1,10 +1,9 @@
 pkgname=gcalctool
 
 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
 }