Bump version and fix conflicts syntax

1 files changed, 4 insertions, 4 deletions

diff --git a/PKGBUILD b/PKGBUILD
index e1e5fd5b9259..62efe3b7f9d8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,19 @@
 # Maintainer: Caleb Maclennan <caleb@alerque.com>
 
 pkgname=mastodon-docker-git
-pkgver=1.0_584_g1c351709
+pkgver=1.1.1_29_gc35bda05
 _branch=master
 pkgrel=0.1
 pkgdesc="A GNU Social-compatible microblogging server"
 arch=('i686' 'x86_64')
 url="https://mastodon.social"
 license=('AGPL-3.0')
-conflicts=("${pkgname%-docker-git}", "${pkgname%-docker-git}-git", "${pkgname%-git}")
-source=("git://github.com/tootsuite/${pkgname%-git}.git#branch=$_branch")
+conflicts=("${pkgname%-docker-git}" "${pkgname%-docker-git}-git" "${pkgname%-git}")
+source=("git://github.com/tootsuite/${pkgname%-docker-git}.git#branch=$_branch")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd "${pkgname%-git}"
+  cd "${pkgname%-docker-git}"
   git describe --long --tags | sed 's/^v//;s/-/_/g'
 }