[arch-commits] Commit in evolution/trunk (PKGBUILD evolution.install)

[Jan de Groot]

    Date: Thursday, March 19, 2009 @ 18:11:01
  Author: jgc
Revision: 30441

upgpkg: evolution 2.26.0-1
    GNOME 2.26

Modified:
  evolution/trunk/PKGBUILD
  evolution/trunk/evolution.install

-------------------+
 PKGBUILD          |   15 ++++++++-------
 evolution.install |    5 -----
 2 files changed, 8 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-19 18:04:27 UTC (rev 30440)
+++ PKGBUILD	2009-03-19 22:11:01 UTC (rev 30441)
@@ -2,22 +2,23 @@
 # Maintainer: dale <dale at archlinux.org>
 
 pkgname=evolution
-pkgver=2.24.4
+pkgver=2.26.0
+_majorver=2.26
 pkgrel=1
 pkgdesc="Integrated Workgroup and Personal Information Management for Gnome"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('libnetworkmanager>=0.7' 'libnotify>=0.4.5' 'gtkhtml>=3.24.4' 'evolution-data-server>=2.24.4.1' 'gnome-pilot>=2.0.17' 'gstreamer0.10>=0.10.21')
-makedepends=('pkgconfig' 'gnome-doc-utils>=0.14.2' 'intltool' 'networkmanager')
+depends=('libnotify>=0.4.5' 'gtkhtml>=3.26.0' 'evolution-data-server>=2.26.0' 'gnome-pilot>=2.0.17' 'gstreamer0.10>=0.10.22')
+makedepends=('pkgconfig' 'gnome-doc-utils>=0.16.0' 'intltool' 'networkmanager')
 options=('!libtool' '!emptydirs')
 install=evolution.install
 url=(http://www.gnome.org/projects/evolution/)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('2d4cb1a65223b141e974b51452feae03')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${_majorver}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('97234b1ecded0232a1b68d2fc03b0252')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  export LDFLAGS="${LDFLAGS} -Wl,--as-needed"
+  # TODO: add libpst and yTNEF
   ./configure --prefix=/usr --sysconfdir=/etc \
         --localstatedir=/var \
 	--libexecdir=/usr/lib \
@@ -31,6 +32,6 @@
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
 
   install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain evolution-${_majorver} ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
   rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 }

Modified: evolution.install
===================================================================
--- evolution.install	2009-03-19 18:04:27 UTC (rev 30440)
+++ evolution.install	2009-03-19 22:11:01 UTC (rev 30441)
@@ -20,8 +20,3 @@
 post_remove() {
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
-
-op=$1
-shift
-
-$op $*