[arch-commits] CVS update of extra/office/gtodo (PKGBUILD gtodo.install)

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 14:09:08
  Author: jgc
    Path: /home/cvs-extra/extra/office/gtodo

Modified: PKGBUILD (1.5 -> 1.6) gtodo.install (1.1 -> 1.2)

upgpkg: gtodo 0.14-3
Move to /usr


---------------+
 PKGBUILD      |   19 +++++++++++--------
 gtodo.install |   35 +++++++++++++++++++----------------
 2 files changed, 30 insertions(+), 24 deletions(-)


Index: extra/office/gtodo/PKGBUILD
diff -u extra/office/gtodo/PKGBUILD:1.5 extra/office/gtodo/PKGBUILD:1.6
--- extra/office/gtodo/PKGBUILD:1.5	Sat Jul 15 16:56:44 2006
+++ extra/office/gtodo/PKGBUILD	Sun Apr 22 14:09:08 2007
@@ -1,24 +1,27 @@
-# $Id: PKGBUILD,v 1.5 2006/07/15 20:56:44 andyrtr Exp $
+# $Id: PKGBUILD,v 1.6 2007/04/22 18:09:08 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Ben <ben at benmazer.net>
 
 pkgname=gtodo
 pkgver=0.14
-pkgrel=2
+pkgrel=3
 pkgdesc="A gtk2 todo list manager"
 arch=(i686 x86_64)
+license=('GPL')
 url="http://gtodo.qballcow.nl"
-depends=('gnome-vfs')
+depends=('gnome-vfs>=2.18.1')
+makedepends=('pkgconfig')
 source=(http://dl.sourceforge.net/sourceforge/gtodo/gtodo-$pkgver.tar.gz)
 md5sums=('51f5d71c51374931a24cce1839402457')
 install=gtodo.install
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/opt/gnome
-  #fix schema installation problems
-  sed -i 's/install-data-am: install-data-local/install-data-am: /' Makefile
-
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make || return 1
-  make DESTDIR=$startdir/pkg install
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
+
+  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/office/gtodo/gtodo.install
diff -u extra/office/gtodo/gtodo.install:1.1 extra/office/gtodo/gtodo.install:1.2
--- extra/office/gtodo/gtodo.install:1.1	Fri Nov 19 02:40:53 2004
+++ extra/office/gtodo/gtodo.install	Sun Apr 22 14:09:08 2007
@@ -1,29 +1,32 @@
-# arg 1:  the new package version
+pkgname=gtodo
+
 post_install() {
-  export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
-  pacman -Ql gtodo | grep etc/gconf/schemas/ | grep \\.schemas | \
-    awk '{ print $2 }' | \
-    while read schema; do
-      opt/gnome/bin/gconftool-2 --makefile-install-rule ${schema} 1>/dev/null
-    done
+  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
+}
+
+pre_upgrade() {
+  pre_remove $1
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
   post_install $1
 }
 
-# arg 1:  the old package version
 pre_remove() {
-  export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
-  pacman -Ql gtodo | grep etc/gconf/schemas/ | grep \\.schemas | \
-    awk '{ print $2 }' | \
-    while read schema; do
-      opt/gnome/bin/gconftool-2 --makefile-uninstall-rule ${schema} 1>/dev/null
-    done
+  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
 }
 
 op=$1
 shift
+
 $op $*