summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Hacohen2020-12-22 11:24:24 +0200
committerTom Hacohen2020-12-22 11:24:24 +0200
commit9413cec96f5994031eab2946a2659c580bdb09ec (patch)
treeb848f8f47135b89155a7565cc992ce13f955d963
parente8737099f1032a1c347876845383f19c2b771ff7 (diff)
downloadaur-9413cec96f5994031eab2946a2659c580bdb09ec.tar.gz
Mark the package as conflicting with the main package.
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD1
2 files changed, 2 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ec3307d819f4..a3f362fea56d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -24,6 +24,7 @@ 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 57fdb21122c3..0375a29eeb5f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,6 +8,7 @@ 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"