summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoremanuele-f2020-11-01 12:37:57 +0100
committeremanuele-f2020-11-01 12:37:57 +0100
commitb4b34987e027793f26885d65af96c657f83ce866 (patch)
tree4cdf2fa75435c27436d06724d823175d54be39e2
parentf56984c50bb03402797a8e616baf6b67d5374bae (diff)
downloadaur-b4b34987e027793f26885d65af96c657f83ce866.tar.gz
Add package conflicts
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD1
2 files changed, 3 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 63f6031e670..430e6d324ac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -22,6 +22,8 @@ pkgbase = syncthingtray-lite
depends = desktop-file-utils
depends = xdg-utils
depends = qt5-webengine
+ conflicts = syncthingtray
+ conflicts = syncthingtray-git
source = syncthingtray-lite-1.0.0.tar.gz::https://github.com/Martchus/syncthingtray/archive/v1.0.0.tar.gz
sha256sums = fe8358c74862511046466d1cbfe216a255ba8d390b464369514e4404e3747b83
diff --git a/PKGBUILD b/PKGBUILD
index a5a1f729963..ac0805787e1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,6 +22,7 @@ depends=('qtutilities' 'qt5-svg' 'openssl' 'desktop-file-utils' 'xdg-utils')
[[ $_webview_provider == webengine ]] && depends+=('qt5-webengine')
makedepends=('cmake' 'ninja' 'qt5-tools' 'mesa')
checkdepends=('cppunit' 'syncthing' 'iproute2')
+conflicts=('syncthingtray' 'syncthingtray-git')
url="https://github.com/Martchus/${_reponame}"
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
sha256sums=('fe8358c74862511046466d1cbfe216a255ba8d390b464369514e4404e3747b83')