summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-07-16 16:25:04 +0200
committerErich Eckner <git@eckner.net>2019-07-16 16:25:04 +0200
commit1c5a8583392a57010510056a0e93827e0ce1589f (patch)
treea6abfde378306d1a8b1042f1abf9f08f8b7142bb
parenta8561ebb4d507bb07cfde25768c72eca0bb04caa (diff)
downloadjabberd2-1c5a8583392a57010510056a0e93827e0ce1589f.tar.xz
add conflicts=jabberd2-git
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD1
2 files changed, 2 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 07e3d9d..bd7517c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -20,6 +20,7 @@ pkgbase = jabberd2
depends = openssl
optdepends = sqlite3
optdepends = postgresql-libs
+ conflicts = jabberd2-git
options = !libtool
backup = etc/jabberd/c2s.xml
backup = etc/jabberd/jabberd.cfg
diff --git a/PKGBUILD b/PKGBUILD
index 942f59b..f8b6b88 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -25,6 +25,7 @@ source=(
)
sha512sums=('SKIP'
'e6507a2a7e226398253623bb46db7ae853b01649b7ac00f3eee0a9b57c2ef0e8ac1f90c4934269f5fe2b7667e56572bed233b847d0b66a3fd37a88b7ed8adc31')
+conflicts=('jabberd2-git')
backup=(
'etc/jabberd/c2s.xml'