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

[Jan de Groot]

    Date: Saturday, September 22, 2007 @ 09:23:24
  Author: jgc
    Path: /home/cvs-extra/extra/network/evolution

Modified: PKGBUILD (1.60 -> 1.61) evolution.install (1.7 -> 1.8)

upgpkg: evolution 2.12.0-1
GNOME 2.20


-------------------+
 PKGBUILD          |   38 ++++++++++++--------------------------
 evolution.install |    2 --
 2 files changed, 12 insertions(+), 28 deletions(-)


Index: extra/network/evolution/PKGBUILD
diff -u extra/network/evolution/PKGBUILD:1.60 extra/network/evolution/PKGBUILD:1.61
--- extra/network/evolution/PKGBUILD:1.60	Sat Jul  7 07:59:20 2007
+++ extra/network/evolution/PKGBUILD	Sat Sep 22 09:23:24 2007
@@ -1,35 +1,23 @@
-# $Id: PKGBUILD,v 1.60 2007/07/07 11:59:20 jgc Exp $
+# $Id: PKGBUILD,v 1.61 2007/09/22 13:23:24 jgc Exp $
 # Maintainer: dale <dale at archlinux.org>
 
 pkgname=evolution
-pkgver=2.10.3
+pkgver=2.12.0
 pkgrel=1
 pkgdesc="Integrated Workgroup and Personal Information Management for Gnome"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 license=('GPL')
-depends=('libnetworkmanager>=0.6.5' 'libnotify>=0.4.4' 'gtkhtml>=3.14.3' 'evolution-data-server>=1.10.3.1' 'libgnomeprintui>=2.18.0' 'scrollkeeper' 'gconf>=2.18.0.1-4')
-makedepends=('perlxml' 'gnome-pilot>=2.0.15-2' 'pkgconfig' 'gnome-doc-utils>=0.10.3')
-options=('!libtool')
+depends=('libnetworkmanager>=0.6.5' 'libnotify>=0.4.4' 'gtkhtml>=3.16.0' 'evolution-data-server>=1.12.0' 'gconf>=2.20.0')
+makedepends=('perlxml' 'gnome-pilot>=2.0.15-2' 'pkgconfig' 'gnome-doc-utils>=0.12.0')
+options=('!libtool' '!emptydirs')
 install=evolution.install
 url=(http://www.gnome.org/projects/evolution/)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.10/${pkgname}-${pkgver}.tar.bz2
-	new-mail-notify-unresolved-symbols.patch
-	bgo407104.patch)
-md5sums=('09cc60b037849b3c9b34961eb7da217f'
-         '3d02da4cc6cbaf63381a23a08bdc52ba'
-         'e27cb071ca4e40e34b8d69c916211116')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.12/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('aaa378a63477b56de214ea9eaa7f8560')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
 
-  if [ -f omf.make ]; then
-    find . -name Makefile.in -exec sed -i -e 's/-scrollkeeper-update.*//' {} \;
-    sed -i -e 's/-scrollkeeper-update.*//' omf.make
-  fi
-  patch -Np1 -i ${startdir}/src/new-mail-notify-unresolved-symbols.patch || return 1
-  patch -Np1 -i ${startdir}/src/bgo407104.patch || return 1
-
-  sed -i -e 's/@ENABLE_SK_TRUE at _s/_s/' help/Makefile.in
   ./configure --prefix=/usr --sysconfdir=/etc \
         --localstatedir=/var \
 	--libexecdir=/usr/lib/evolution \
@@ -41,13 +29,11 @@
 	--with-krb5=/usr \
 	--with-krb5-includes=/usr/include/heimdal
   make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
-
-  mkdir -p ${startdir}/pkg/usr/include/evolution-2.10/composer
-  install -m644 composer/e-msg*.h ${startdir}/pkg/usr/include/evolution-2.10/composer/
-  install -m644 composer/Editor.h ${startdir}/pkg/usr/include/evolution-2.10/composer/
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
 
-  ln -sf evolution-2.10 ${startdir}/pkg/usr/bin/evolution
+  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/
 
   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
Index: extra/network/evolution/evolution.install
diff -u extra/network/evolution/evolution.install:1.7 extra/network/evolution/evolution.install:1.8
--- extra/network/evolution/evolution.install:1.7	Sat Jul  7 07:59:20 2007
+++ extra/network/evolution/evolution.install	Sat Sep 22 09:23:24 2007
@@ -2,7 +2,6 @@
 
 post_install() {
   usr/sbin/gconfpkg --install ${pkgname}
-  scrollkeeper-update -q -p var/lib/scrollkeeper
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
@@ -19,7 +18,6 @@
 }
 
 post_remove() {
-  scrollkeeper-update -q -p var/lib/scrollkeeper
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }