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

[Jan de Groot]

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

Modified: PKGBUILD (1.13 -> 1.14) planner.install (1.4 -> 1.5)

upgpkg: planner 0.14.2-2
Move to /usr


-----------------+
 PKGBUILD        |   38 +++++++++++++++++---------------------
 planner.install |   16 ++++++++++------
 2 files changed, 27 insertions(+), 27 deletions(-)


Index: extra/office/planner/PKGBUILD
diff -u extra/office/planner/PKGBUILD:1.13 extra/office/planner/PKGBUILD:1.14
--- extra/office/planner/PKGBUILD:1.13	Thu Mar 29 17:59:13 2007
+++ extra/office/planner/PKGBUILD	Sun Apr 22 14:10:08 2007
@@ -1,36 +1,32 @@
-# $Id: PKGBUILD,v 1.13 2007/03/29 21:59:13 tom Exp $
+# $Id: PKGBUILD,v 1.14 2007/04/22 18:10:08 jgc Exp $
 # Contributor: herb  <herb at archlinux.org>
-# Maintainer: Arjan Timmerman <arjan at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=planner
 pkgver=0.14.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Gnome Project Management System"
 arch=(i686 x86_64)
+license=('GPL')
 url="http://live.gnome.org/Planner"
-depends=('libgnomeprintui' 'libgnomeui' 'evolution-data-server' 'avahi')
-makedepends=('intltool')
+depends=('libgnomeprintui>=2.18.0' 'libgnomeui>=2.18.1-2' 'evolution-data-server>=1.10.1-2' 'libxslt' 'scrollkeeper' 'desktop-file-utils')
+makedepends=('pkgconfig' 'perlxml' 'gnome-doc-utils>=0.10.3')
 conflicts=('mrproject' 'libmrproject')
 replaces=('mrproject' 'libmrproject' )
-options=('NOLIBTOOL')
+options=('nolibtool')
 install=planner.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/planner/0.14/planner-$pkgver.tar.bz2)
+source=(http://ftp.gnome.org/pub/GNOME/sources/planner/0.14/planner-${pkgver}.tar.bz2)
 md5sums=('d03081c6562a94b64628689500f55195')
 
 build() {
-  [ "$GNOMEDIR" = "" ] && source /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
-  #    sed -i -e 's/-scrollkeeper-update.*//' omf.make
-  #fi
-
-  ./configure --prefix=/opt/gnome --disable-update-mimedb \
-	--enable-python --enable-eds --disable-schemas-install \
-	--disable-scrollkeeper
+  cd ${startdir}/src/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var --disable-update-mimedb \
+              --enable-python --enable-eds \
+	      --disable-scrollkeeper
   make || return 1
-  make 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
+  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/planner/planner.install
diff -u extra/office/planner/planner.install:1.4 extra/office/planner/planner.install:1.5
--- extra/office/planner/planner.install:1.4	Thu Jun 22 18:02:24 2006
+++ extra/office/planner/planner.install	Sun Apr 22 14:10:08 2007
@@ -1,10 +1,11 @@
 pkgname=planner
 
 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
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 pre_upgrade() {
@@ -16,19 +17,22 @@
 }
 
 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
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 op=$1