[arch-commits] CVS update of extra/network/evolution (PKGBUILD)

[Jan de Groot]

    Date: Wednesday, March 12, 2008 @ 20:03:32
  Author: jgc
    Path: /home/cvs-extra/extra/network/evolution

Modified: PKGBUILD (1.65 -> 1.66)

upgpkg: evolution 2.22.0-1
    GNOME 2.22


----------+
 PKGBUILD |   29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)


Index: extra/network/evolution/PKGBUILD
diff -u extra/network/evolution/PKGBUILD:1.65 extra/network/evolution/PKGBUILD:1.66
--- extra/network/evolution/PKGBUILD:1.65	Thu Mar  6 13:26:24 2008
+++ extra/network/evolution/PKGBUILD	Wed Mar 12 20:03:32 2008
@@ -1,24 +1,22 @@
-# $Id: PKGBUILD,v 1.65 2008/03/06 18:26:24 jgc Exp $
+# $Id: PKGBUILD,v 1.66 2008/03/13 00:03:32 jgc Exp $
 # Maintainer: dale <dale at archlinux.org>
 
 pkgname=evolution
-pkgver=2.12.3
-pkgrel=2
+pkgver=2.22.0
+pkgrel=1
 pkgdesc="Integrated Workgroup and Personal Information Management for Gnome"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('libnetworkmanager>=0.6.5' 'libnotify>=0.4.4' 'gtkhtml>=3.16.3' 'evolution-data-server>=1.12.3' 'gconf>=2.20.1')
-makedepends=('perlxml' 'gnome-pilot>=2.0.15-2' 'pkgconfig' 'gnome-doc-utils>=0.12.0' 'gstreamer0.10')
+depends=('libnetworkmanager>=0.6.5' 'libnotify>=0.4.4' 'gtkhtml>=3.18.0' 'evolution-data-server>=2.22.0' 'gconf>=2.22.0')
+makedepends=('perlxml' 'gnome-pilot>=2.0.16' 'pkgconfig' 'gnome-doc-utils>=0.12.2' 'gstreamer0.10>=0.10.15')
 options=('!libtool' '!emptydirs')
 install=evolution.install
 url=(http://www.gnome.org/projects/evolution/)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.12/${pkgname}-${pkgver}.tar.bz2
-	evolution-CVE-2008-0072.patch)
-md5sums=('554698d7387aee82c5f4d4520760503d' 'bf92e58da9603b58bbbd7b8316aa994e')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.22/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('22567465cfba2658fd0a9be03f8c854f')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np0 -i ${startdir}/src/evolution-CVE-2008-0072.patch || return 1
 
   ./configure --prefix=/usr --sysconfdir=/etc \
         --localstatedir=/var \
@@ -28,16 +26,15 @@
 	--with-openldap=yes \
 	--enable-smime=yes \
 	--enable-pilot-conduits=yes \
-	--with-krb5=/usr \
-	--with-krb5-includes=/usr/include/heimdal
+	--with-krb5=/usr || return 1
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
 
-  mkdir -p ${startdir}/pkg/usr/include/evolution-2.12/composer
-  install -m644 composer/e-msg*.h ${startdir}/pkg/usr/include/evolution-2.12/composer/
-  install -m644 composer/Editor.h ${startdir}/pkg/usr/include/evolution-2.12/composer/
+  #install -m755 -d ${startdir}/pkg/usr/include/evolution-2.12/composer
+  #install -m644 composer/e-msg*.h ${startdir}/pkg/usr/include/evolution-2.12/composer/
+  #install -m644 composer/Editor.h ${startdir}/pkg/usr/include/evolution-2.12/composer/
 
-  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
 }