summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Hacohen2020-12-23 13:02:41 +0200
committerTom Hacohen2020-12-23 13:02:41 +0200
commit2a7916dada749541eefa9459a88e6555048e622d (patch)
tree6272a2ddff0675e79160969505558832a4c442ee
parent9413cec96f5994031eab2946a2659c580bdb09ec (diff)
downloadaur-2a7916dada749541eefa9459a88e6555048e622d.tar.gz
Revert "Mark the package as conflicting with the main package."
Actually no need, because there will be filesystem conflicts anyway, and since the latest kdepim-runtime is not yet available everywhere (e.g. Manajaro), it's good to have this available for users. This reverts commit 9413cec96f5994031eab2946a2659c580bdb09ec.
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD1
2 files changed, 0 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a3f362fea56d..ec3307d819f4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -24,7 +24,6 @@ pkgbase = kdepim-runtime-etesync-git
depends = qt5-networkauth
depends = kdepim-runtime
depends = libetebase
- conflicts = kdepim-runtime
source = kdepim-runtime-etesync::git+https://invent.kde.org/pim/kdepim-runtime?branch=release/20.12
source = 0001-XXX-Ease-version-requirements.patch
sha512sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 0375a29eeb5f..57fdb21122c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,6 @@ pkgdesc='DO NOT USE! It is now part of main kdepim-runtime package'
arch=(x86_64)
url='https://kontact.kde.org'
license=(GPL LGPL FDL)
-conflicts=(kdepim-runtime)
depends=(libkolabxml kdav akonadi-calendar knotifyconfig kalarmcal kmbox pimcommon akonadi-notes akonadi qca qt5-networkauth kdepim-runtime libetebase)
makedepends=(extra-cmake-modules kdoctools boost git)
source=("${_pkgname}::git+https://invent.kde.org/pim/kdepim-runtime?branch=release/20.12"