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

[Jan de Groot]

    Date: Friday, March 14, 2008 @ 13:45:51
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/evolution-exchange

Modified: PKGBUILD (1.25 -> 1.26) evolution-exchange.install (1.2 -> 1.3)

upgpkg: evolution-exchange 2.22.0-1
    GNOME 2.22


----------------------------+
 PKGBUILD                   |   20 ++++++++++----------
 evolution-exchange.install |    5 -----
 2 files changed, 10 insertions(+), 15 deletions(-)


Index: extra/gnome/evolution-exchange/PKGBUILD
diff -u extra/gnome/evolution-exchange/PKGBUILD:1.25 extra/gnome/evolution-exchange/PKGBUILD:1.26
--- extra/gnome/evolution-exchange/PKGBUILD:1.25	Thu Jan 10 16:28:15 2008
+++ extra/gnome/evolution-exchange/PKGBUILD	Fri Mar 14 13:45:51 2008
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD,v 1.25 2008/01/10 21:28:15 jgc Exp $
+# $Id: PKGBUILD,v 1.26 2008/03/14 17:45:51 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=evolution-exchange
-pkgver=2.12.3
+pkgver=2.22.0
 pkgrel=1
 pkgdesc="Ximian Connector Exchange plugin for Evolution"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.ximian.com"
-depends=('evolution-data-server>=1.12.3' 'libgnomeui>=2.20.1')
-makedepends=('perlxml' 'pkgconfig' 'evolution>=2.12.3')
+depends=('evolution-data-server>=2.22.0' 'libgnomeui>=2.22.01')
+makedepends=('perlxml' 'pkgconfig' 'evolution>=2.22.0')
 replaces=('ximian-connector')
 conflicts=('ximian-connector')
 options=('!libtool' '!emptydirs')
 install=evolution-exchange.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.12/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('1bdda76724a17fb7606abcdfdb6ec170')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.22/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('fea02f97cc8fe62dca0d50ffdc19e416')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
@@ -24,11 +24,11 @@
       -e 's|DB_LIBS="-L$withval/lib -ldb"|DB_LIBS="-L$withval/lib -ldb-4.1"|' \
       -i configure
   ./configure --prefix=/usr --sysconfdir=/etc \
-  	--libexecdir=/var --disable-static --with-libdb=/usr 
+  	--libexecdir=/var --disable-static --with-libdb=/usr  || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR=${startdir}/pkg install || return 1
 
-  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
+  install -m755 -d ${startdir}/pkg/usr/share/gconf/schemas
+  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas || return 1
   rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
 }
Index: extra/gnome/evolution-exchange/evolution-exchange.install
diff -u extra/gnome/evolution-exchange/evolution-exchange.install:1.2 extra/gnome/evolution-exchange/evolution-exchange.install:1.3
--- extra/gnome/evolution-exchange/evolution-exchange.install:1.2	Sat Jul  7 08:24:11 2007
+++ extra/gnome/evolution-exchange/evolution-exchange.install	Fri Mar 14 13:45:51 2008
@@ -15,8 +15,3 @@
 pre_remove() {
   usr/sbin/gconfpkg --uninstall ${pkgname}
 }
-
-op=$1
-shift
-
-$op $*