summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Berthaud2019-11-27 10:54:46 +0100
committerAlexandre Berthaud2019-11-27 10:54:46 +0100
commit361449a4da4bba3b647be59e8dfb5aa695f664ee (patch)
tree94714582375ddab7a5a988e1fa2ab3690020a668
parentb1bcc017115bcec9b19eec309dda8f7c637c752e (diff)
downloadaur-361449a4da4bba3b647be59e8dfb5aa695f664ee.tar.gz
Add conflicts keystore-explorer property
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD1
2 files changed, 2 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0ceb62a476ee..99d8f53ca139 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,6 +9,7 @@ pkgbase = keystore-explorer-bin
license = GPL
depends = java-runtime
source = https://github.com/kaikramer/keystore-explorer/releases/download/v5.4.1/kse-541.zip
+ conflicts = keystore-explorer
source = keystore-explorer.desktop
md5sums = d21de02af032ebcca0a0bb53f8d8c96c
md5sums = dfaa247ab726fe2e44368101399b508d
diff --git a/PKGBUILD b/PKGBUILD
index 9d2bd633a560..f6e2640f1be3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,6 +11,7 @@ arch=('i686' 'x86_64')
url="http://www.keystore-explorer.org/"
license=('GPL')
depends=('java-runtime')
+conflicts=('keystore-explorer')
install=${pkgname}.install
source=("https://github.com/kaikramer/${_reponame}/releases/download/v${pkgver}/${_pkgname}-${_pkgver}.zip"
"${_reponame}.desktop")