[arch-commits] CVS update of extra/system/gnotime (PKGBUILD gnotime.install)

[Roman Kyrylych]

    Date: Wednesday, January 30, 2008 @ 13:28:31
  Author: roman
    Path: /home/cvs-extra/extra/system/gnotime

Modified: PKGBUILD (1.10 -> 1.11) gnotime.install (1.3 -> 1.4)

upgpkg: gnotime 2.2.3-1


-----------------+
 PKGBUILD        |   33 ++++++++++++++++-----------------
 gnotime.install |   21 ++-------------------
 2 files changed, 18 insertions(+), 36 deletions(-)


Index: extra/system/gnotime/PKGBUILD
diff -u extra/system/gnotime/PKGBUILD:1.10 extra/system/gnotime/PKGBUILD:1.11
--- extra/system/gnotime/PKGBUILD:1.10	Sun Apr 22 14:10:35 2007
+++ extra/system/gnotime/PKGBUILD	Wed Jan 30 13:28:31 2008
@@ -1,36 +1,35 @@
-# $Id: PKGBUILD,v 1.10 2007/04/22 18:10:35 jgc Exp $
-# Maintainer: Paul Mattal <paul at archlinux.org>
+# $Id: PKGBUILD,v 1.11 2008/01/30 18:28:31 roman Exp $
+# Maintainer: Roman Kyrylych <roman at archlinux.org>
 # Contributor: Christian Theune <ct at gocept.com>
 
 pkgname=gnotime
-pkgver=2.2.2
-pkgrel=4
+pkgver=2.2.3
+pkgrel=1
 pkgdesc="Gnome Time Tracker"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL')
 url="http://gttr.sourceforge.net/"
-depends=('gtkhtml>=3.14.1-2' 'guile>=1.8.1')
-makedepends=('pkgconfig')
-options=('nolibtool')
-source=(http://heanet.dl.sourceforge.net/sourceforge/gttr/gnotime-${pkgver}.tar.gz)
+depends=('gtkhtml>=3.14.1-2' 'guile>=1.8.1' 'qof' 'gconf>=2.18.0.1-4'
+         'desktop-file-utils')
+makedepends=('perlxml' 'gnome-doc-utils>=0.11.2')
+source=(http://downloads.sourceforge.net/gttr/gnotime-${pkgver}.tar.gz)
 install=gnotime.install
-md5sums=('8c05509f57a278de03a97fae110de3f5')
+md5sums=('067c3579411cd98e0b18fec0b36475a6')
+options=('!libtool' '!emptydirs')
 
 build() {
   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
-
   sed -i -e 's/3.8/3.14/g' configure
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-static
+              --localstatedir=/var --disable-static --disable-scrollkeeper
   make || return 1
   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
+  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
+
+  chmod +x ${startdir}/pkg/usr/bin/gnotime-remote
 }
Index: extra/system/gnotime/gnotime.install
diff -u extra/system/gnotime/gnotime.install:1.3 extra/system/gnotime/gnotime.install:1.4
--- extra/system/gnotime/gnotime.install:1.3	Sun Apr 22 14:10:35 2007
+++ extra/system/gnotime/gnotime.install	Wed Jan 30 13:28:31 2008
@@ -1,9 +1,7 @@
 pkgname=gnotime
 
 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}
   update-desktop-database -q
 }
 
@@ -16,24 +14,9 @@
 }
 
 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
+  usr/sbin/gconfpkg --uninstall ${pkgname}
 }
 
 post_remove() {
   update-desktop-database -q
-  scrollkeeper-update -q -p var/lib/scrollkeeper
 }
-
-op=$1
-shift
-
-$op $*