summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaleb Maclennan2017-04-07 13:08:33 +0300
committerCaleb Maclennan2017-04-07 13:08:33 +0300
commit991e1479951190348468fa8089a30ee58b2added (patch)
tree842c684f54e9a5a2821c74bfb07d7760dfee687a
parent75b295088c3c75c96ad424e040269185ddd5fc9d (diff)
downloadaur-991e1479951190348468fa8089a30ee58b2added.tar.gz
Update conflicts info for alternate package versions
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD2
2 files changed, 5 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7570e4b15dbd..a3e699a958a7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Fri Apr 7 09:47:00 UTC 2017
+# Fri Apr 7 10:07:40 UTC 2017
pkgbase = mastodon-git
pkgdesc = A GNU Social-compatible microblogging server
pkgver = 1.0_584_g1c351709
@@ -8,7 +8,9 @@ pkgbase = mastodon-git
arch = i686
arch = x86_64
license = AGPL-3.0
- conflicts = mastodon
+ conflicts = mastodon,
+ conflicts = mastodon-docker,
+ conflicts = mastodon-docker-git
source = git://github.com/tootsuite/mastodon.git#branch=master
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 153ee04f8091..a042ec037cf8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ pkgdesc="A GNU Social-compatible microblogging server"
arch=('i686' 'x86_64')
url="https://mastodon.social"
license=('AGPL-3.0')
-conflicts=("${pkgname%-git}")
+conflicts=("${pkgname%-git}", "${pkgname%-git}-docker", "${pkgname%-git}-docker-git")
source=("git://github.com/tootsuite/${pkgname%-git}.git#branch=$_branch")
sha256sums=('SKIP')