[arch-commits] CVS update of extra/gnome/evolution-webcal (2 files)

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 11:54:39
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/evolution-webcal

Modified: PKGBUILD (1.13 -> 1.14) evolution-webcal.install (1.5 -> 1.6)

upgpkg: evolution-webcal 2.10.0-2
Move to /usr


--------------------------+
 PKGBUILD                 |   25 +++++++++++--------------
 evolution-webcal.install |   12 +++++++-----
 2 files changed, 18 insertions(+), 19 deletions(-)


Index: extra/gnome/evolution-webcal/PKGBUILD
diff -u extra/gnome/evolution-webcal/PKGBUILD:1.13 extra/gnome/evolution-webcal/PKGBUILD:1.14
--- extra/gnome/evolution-webcal/PKGBUILD:1.13	Tue Mar 20 12:43:49 2007
+++ extra/gnome/evolution-webcal/PKGBUILD	Sun Apr 22 11:54:38 2007
@@ -1,31 +1,28 @@
-# $Id: PKGBUILD,v 1.13 2007/03/20 16:43:49 jgc Exp $
+# $Id: PKGBUILD,v 1.14 2007/04/22 15:54:38 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=evolution-webcal
 pkgver=2.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Evolution Web calendar"
 arch=(i686 x86_64)
+license=('GPL')
 install=evolution-webcal.install
 url="http://www.ximian.com"
-depends=('libgnomeui>=2.18.1' 'evolution-data-server>=1.10.0')
-makedepends=('perlxml')
+depends=('libgnomeui>=2.18.1-2' 'evolution-data-server>=1.10.1-2')
+makedepends=('perlxml' 'pkgconfig' 'evolution>=2.10.1-2')
 source=(http://ftp.acc.umu.se/pub/GNOME/sources/evolution-webcal/2.10/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('a29004e6e1ad977845ed7c68963c8925')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /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
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --libexecdir=/usr/lib/evolution-webcal \
+              --localstatedir=/var 
   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/gnome/evolution-webcal/evolution-webcal.install
diff -u extra/gnome/evolution-webcal/evolution-webcal.install:1.5 extra/gnome/evolution-webcal/evolution-webcal.install:1.6
--- extra/gnome/evolution-webcal/evolution-webcal.install:1.5	Tue Mar 20 12:43:49 2007
+++ extra/gnome/evolution-webcal/evolution-webcal.install	Sun Apr 22 11:54:38 2007
@@ -1,8 +1,8 @@
 pkgname=evolution-webcal
 
 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
 }
 
 pre_upgrade() {
@@ -14,14 +14,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() {