[arch-commits] Commit in planner/repos (3 files)

[Eric Belanger]

    Date: Tuesday, May 6, 2008 @ 22:12:18
  Author: eric
Revision: 1387

Merged revisions 2-1386 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/planner/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r1385 | eric | 2008-05-06 22:00:52 -0400 (Tue, 06 May 2008) | 2 lines
  
  upgpkg: planner 0.14.3-1
      upstream update, disbled SMP build, added pygtk makedepends, updated .install file to use gconfpkg
........

Modified:
  planner/repos/extra-i686/	(properties)
  planner/repos/extra-i686/PKGBUILD
  planner/repos/extra-i686/planner.install

-----------------+
 PKGBUILD        |   14 +++++++-------
 planner.install |   21 ++-------------------
 2 files changed, 9 insertions(+), 26 deletions(-)


Property changes on: planner/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /planner/trunk:1
   + /planner/trunk:1-1386

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-05-07 02:01:06 UTC (rev 1386)
+++ extra-i686/PKGBUILD	2008-05-07 02:12:18 UTC (rev 1387)
@@ -3,20 +3,20 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=planner
-pkgver=0.14.2
-pkgrel=2
+pkgver=0.14.3
+pkgrel=1
 pkgdesc="Gnome Project Management System"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://live.gnome.org/Planner"
-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')
+depends=('libgnomeprintui>=2.18.0' 'libgnomeui>=2.18.1-2' 'evolution-data-server>=2.22.1' 'libxslt' 'desktop-file-utils')
+makedepends=('pkgconfig' 'perlxml' 'gnome-doc-utils>=0.11.2' 'pygtk')
 conflicts=('mrproject' 'libmrproject')
 replaces=('mrproject' 'libmrproject' )
-options=('nolibtool')
+options=('!libtool' '!makeflags')
 install=planner.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/planner/0.14/planner-${pkgver}.tar.bz2)
-md5sums=('d03081c6562a94b64628689500f55195')
+source=(http://ftp.gnome.org/pub/GNOME/sources/planner/${pkgver%.*}/planner-${pkgver}.tar.bz2)
+md5sums=('9aee1307f8b9d643241473791f0efa64')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}

Modified: extra-i686/planner.install
===================================================================
--- extra-i686/planner.install	2008-05-07 02:01:06 UTC (rev 1386)
+++ extra-i686/planner.install	2008-05-07 02:12:18 UTC (rev 1387)
@@ -1,9 +1,7 @@
 pkgname=planner
 
 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
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
@@ -17,25 +15,10 @@
 }
 
 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() {
-  scrollkeeper-update -q -p var/lib/scrollkeeper
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
-
-op=$1
-shift
-
-$op $*