diff options
author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-09-04 02:06:43 -0300 |
---|---|---|
committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-09-04 02:06:43 -0300 |
commit | 5e62f8a54f47a73fd66df39ed7e841af0e22bca1 (patch) | |
tree | eb64bec3b6d5c4ba29c00eed4c99868d4ba692f8 /nonprism/kdepim-runtime | |
parent | 0a088f3c285e53ee377271f42c16071e3ee5bafd (diff) |
kdepim-runtime-4.14.0-3.nonprism2: add kdepim-runtime-coherence on conflicts array
Diffstat (limited to 'nonprism/kdepim-runtime')
-rw-r--r-- | nonprism/kdepim-runtime/PKGBUILD | 4 |
1 files changed, 2 insertions, 2 deletions
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') |