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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 14:10:35
  Author: jgc
    Path: /home/cvs-extra/extra/system/gnotime

Modified: PKGBUILD (1.9 -> 1.10) gnotime.install (1.2 -> 1.3)

upgpkg: gnotime 2.2.2-4
Move to /usr


-----------------+
 PKGBUILD        |   19 +++++++++----------
 gnotime.install |   12 +++++++-----
 2 files changed, 16 insertions(+), 15 deletions(-)


Index: extra/system/gnotime/PKGBUILD
diff -u extra/system/gnotime/PKGBUILD:1.9 extra/system/gnotime/PKGBUILD:1.10
--- extra/system/gnotime/PKGBUILD:1.9	Sat Mar 31 11:06:27 2007
+++ extra/system/gnotime/PKGBUILD	Sun Apr 22 14:10:35 2007
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD,v 1.9 2007/03/31 15:06:27 jgc Exp $
+# $Id: PKGBUILD,v 1.10 2007/04/22 18:10:35 jgc Exp $
 # Maintainer: Paul Mattal <paul at archlinux.org>
 # Contributor: Christian Theune <ct at gocept.com>
 
 pkgname=gnotime
 pkgver=2.2.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Gnome Time Tracker"
 arch=(i686 x86_64)
+license=('GPL')
 url="http://gttr.sourceforge.net/"
-depends=('gtkhtml>=3.14.0' 'guile>=1.8.1')
+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)
@@ -16,9 +17,6 @@
 md5sums=('8c05509f57a278de03a97fae110de3f5')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
-
-  export MAKEFLAGS="-j1"
   cd ${startdir}/src/${pkgname}-${pkgver}
 
   find . -name Makefile.in -exec sed -i -e 's/-scrollkeeper-update.*//' {} \;
@@ -27,11 +25,12 @@
   fi
 
   sed -i -e 's/3.8/3.14/g' configure
-  ./configure --prefix=/opt/gnome
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var --disable-static
   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/system/gnotime/gnotime.install
diff -u extra/system/gnotime/gnotime.install:1.2 extra/system/gnotime/gnotime.install:1.3
--- extra/system/gnotime/gnotime.install:1.2	Sun Oct 15 06:02:12 2006
+++ extra/system/gnotime/gnotime.install	Sun Apr 22 14:10:35 2007
@@ -1,8 +1,8 @@
 pkgname=gnotime
 
 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
 }
@@ -16,14 +16,16 @@
 }
 
 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() {