diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-17 15:59:35 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-17 15:59:35 -0300 |
commit | 6fed2edc6f9533e7894bbbacdbd1dbbb50076b01 (patch) | |
tree | fae0fe13e944d0265e921e57e355718c3ccd3f10 /kde-unstable/kdepim/PKGBUILD | |
parent | 048b7287473507b76146e58378f4bfcfacf1060b (diff) | |
parent | 84837d89991e1e82e5aef8e297541c572ebf2efa (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/libmcs/PKGBUILD
extra/libmowgli/PKGBUILD
kde-unstable/kdepim/PKGBUILD
Diffstat (limited to 'kde-unstable/kdepim/PKGBUILD')
-rw-r--r-- | kde-unstable/kdepim/PKGBUILD | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/kde-unstable/kdepim/PKGBUILD b/kde-unstable/kdepim/PKGBUILD index e2b7ab7d9..24cc2f899 100644 --- a/kde-unstable/kdepim/PKGBUILD +++ b/kde-unstable/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 108250 2011-01-30 15:05:18Z andrea $ +# $Id: PKGBUILD 119654 2011-04-13 08:39:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -20,8 +20,8 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-ktimetracker' 'kdepim-libkdepim' 'kdepim-wizards') -pkgver=4.5.94.1 -pkgrel=2 +pkgver=4.5.95 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -31,8 +31,8 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' #source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") source=("http://download.kde.org/unstable/${pkgbase}/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" 'disable-l10n.patch') -sha1sums=('0243aa59c3acd9c38403b3acddb33c22c9c39c65' - '25e36f160ced051268e59fad6ed2de33a9c7657a') +sha1sums=('5227ac466247f043643bb9eaa7568e8b936edafe' + '25e36f160ced051268e59fad6ed2de33a9c7657a') build() { cd "${srcdir}"/${pkgbase}-${pkgver} @@ -149,6 +149,7 @@ package_kdepim-kmail() { 'kdepim-mimelib' 'kdepim-plugins') replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' 'kdepim-mimelib' 'kdepim-plugins') + optdepends=('cyrus-sasl-plugins: CRAM-MD5 authentication') for i in kmail doc/kmail kmailcvt ksendemail libksieve mailcommon \ nepomuk_email_feeder ontologies templateparser kontact/plugins/kmail; do cd $srcdir/build/${i} @@ -189,7 +190,7 @@ package_kdepim-kontact() { install='kdepim.install' conflcits=('kdepim-kontactinterfaces') replaces=('kdepim-kontactinterfaces') - for i in kontact/src kontact/pics doc/kontact \ + for i in kontact/src doc/kontact \ kontact/plugins/summary kontact/plugins/specialdates; do cd $srcdir/build/${i} make DESTDIR=$pkgdir install |