[arch-commits] Commit in evolution-data-server/repos (extra-i686 extra-i686/PKGBUILD)

[Jan de Groot]

    Date: Wednesday, October 21, 2009 @ 14:59:34
  Author: jgc
Revision: 56378

Merged revisions 56097 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/evolution-data-server/trunk

........
  r56097 | jgc | 2009-10-19 19:07:15 +0200 (Mon, 19 Oct 2009) | 2 lines
  
  upgpkg: evolution-data-server 2.28.1-1
      Build with db 4.8 instead of 4.1, upstream recommends latest version
........

Modified:
  evolution-data-server/repos/extra-i686/	(properties)
  evolution-data-server/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)


Property changes on: evolution-data-server/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /evolution-data-server/trunk:1-54772
   + /evolution-data-server/trunk:1-56377

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-10-21 18:55:48 UTC (rev 56377)
+++ extra-i686/PKGBUILD	2009-10-21 18:59:34 UTC (rev 56378)
@@ -2,26 +2,22 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=evolution-data-server
-pkgver=2.28.0
+pkgver=2.28.1
 pkgrel=1
 pkgdesc="Evolution Data Server provides a central location for addressbook and calendar in the GNOME Desktop"
 arch=(i686 x86_64)
-depends=('libsoup>=2.27.92' 'nss>=3.12.4' 'libglade>=2.6.4' 'gnome-keyring>=2.27.92' 'db4.1' 'heimdal>=1.2.1' 'libgweather>=2.27.91' 'libical>=0.43' 'libbonobo>=2.24.1')
+depends=('libsoup>=2.28.0' 'nss>=3.12.4' 'libglade>=2.6.4' 'gnome-keyring>=2.28.1' 'heimdal>=1.2.1' 'libgweather>=2.28.0' 'libical>=0.43' 'libbonobo>=2.24.2' 'db>=4.8.24')
 makedepends=('intltool' 'pkgconfig' 'gtk-doc')
 options=('!libtool')
 url="http://www.gnome.org"
 license=('GPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('01fead604816fb135aeb5921687d99773e966014a17c1cae230c307386e13814')
+sha256sums=('651de21c10765d4b6503ff59aa50c8b9e1bc704d94341d9a275e3b50d68dae8a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  # Look for correct DB, we want 4.1
-  sed -e 's|DB_CFLAGS="-I$withval/include"|DB_CFLAGS="-I$withval/include/db4.1"|' \
-      -e 's|DB_LIBS="-L$withval/lib -ldb"|DB_LIBS="-L$withval/lib -ldb-4.1"|' \
-      -i configure || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var  --with-openldap=yes \
+      --localstatedir=/var --with-openldap=yes \
       --libexecdir=/usr/lib/evolution-data-server-1.2 \
       --with-krb5=/usr --enable-gnome-keyring \
       --with-libdb=/usr || return 1