From 9837542407e0901e3ff7af27465527145a8ed094 Mon Sep 17 00:00:00 2001 From: AlmAck Date: Sat, 12 Sep 2015 12:12:42 +0000 Subject: [PATCH] akonadi fix conflicts/replacement deps --- akonadi/PKGBUILD | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/akonadi/PKGBUILD b/akonadi/PKGBUILD index ba0769462..447af7241 100644 --- a/akonadi/PKGBUILD +++ b/akonadi/PKGBUILD @@ -3,7 +3,7 @@ source ../kdeapps.conf pkgname=akonadi pkgver=${_kdever} -pkgrel=2 +pkgrel=6 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" arch=('x86_64') url='http://community.kde.org/KDE_PIM/Akonadi' @@ -14,9 +14,8 @@ checkdepends=('xorg-server-xvfb') optdepends=('postgresql: PostgreSQL backend' 'mariadb: MariaDB backend') install="${pkgname}.install" -replaces=('akonadi-qt4') -provides=('akonadi-qt4') -conflics=('akonadi-qt4') +replaces=('akonadi<15' 'akonadi-qt4') +conflicts=('akonadi<15' 'akonadi-qt4') source=("$_mirror/${pkgname}-$_kdever.tar.xz") sha256sums=(`grep ${pkgname}-$_kdever.tar.xz ../checksums.txt | cut -d " " -f1`)