From 5e62f8a54f47a73fd66df39ed7e841af0e22bca1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 4 Sep 2014 02:06:43 -0300 Subject: kdepim-runtime-4.14.0-3.nonprism2: add kdepim-runtime-coherence on conflicts array --- nonprism/kdepim-runtime/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nonprism') diff --git a/nonprism/kdepim-runtime/PKGBUILD b/nonprism/kdepim-runtime/PKGBUILD index fd33567cd..07e7e436b 100644 --- a/nonprism/kdepim-runtime/PKGBUILD +++ b/nonprism/kdepim-runtime/PKGBUILD @@ -5,7 +5,7 @@ pkgname=kdepim-runtime pkgver=4.14.0 -pkgrel=3.nonprism1 +pkgrel=3.nonprism2 pkgdesc='Extends the functionality of kdepim, without libkgapi and libkfbapi support' arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdepim-runtime' @@ -14,7 +14,7 @@ depends=('kdebase-runtime' 'libkolab' 'libaccounts-qt' 'signon') makedepends=('cmake' 'automoc4' 'boost') install="${pkgname}.install" replaces=('kdepim-runtime-coherence' 'kdepim-runtime-nonprism') -conflicts=(kdepim-runtime-nonprism) +conflicts=('kdepim-runtime-coherence' 'kdepim-runtime-nonprism') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") sha1sums=('6cb3b92d57343872ddfc6ba24b5ebdd005126fa2') -- cgit v1.2.3-2-g168b