From 933a76e523faa2655c73410731e4dd2861c3a5cc Mon Sep 17 00:00:00 2001
From: Caleb Maclennan <caleb@alerque.com>
Date: Tue, 11 Apr 2017 16:17:12 +0300
Subject: [PATCH] Bump version and fix conflicts syntax

---
 .SRCINFO | 12 ++++++------
 PKGBUILD |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 77a29ed..4757c26 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
 # Generated by mksrcinfo v8
-# Fri Apr  7 14:45:42 UTC 2017
+# Tue Apr 11 13:16:53 UTC 2017
 pkgbase = mastodon
 	pkgdesc = A GNU Social-compatible microblogging server
-	pkgver = 1.1
+	pkgver = 1.1.1
 	pkgrel = 0.1
 	url = https://mastodon.social
 	arch = i686
 	arch = x86_64
 	license = AGPL-3.0
-	conflicts = mastodon-git,
-	conflicts = mastodon-docker,
+	conflicts = mastodon-git
+	conflicts = mastodon-docker
 	conflicts = mastodon-docker-git
-	source = https://github.com/tootsuite/mastodon/archive/v1.1.tar.gz
-	sha256sums = df6c1a33de5481eebe24b718708d942fc2f6f96bb7932bddcd3f053ab5870967
+	source = https://github.com/tootsuite/mastodon/archive/v1.1.1.tar.gz
+	sha256sums = e5b394a764710facb5830b7fad54a714aa08920017e6ecd02145bcbf70c5cded
 
 pkgname = mastodon
 
diff --git a/PKGBUILD b/PKGBUILD
index b93f953..0a469c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,15 @@
 # Maintainer: Caleb Maclennan <caleb@alerque.com>
 
 pkgname=mastodon
-pkgver=1.1
+pkgver=1.1.1
 pkgrel=0.1
 pkgdesc="A GNU Social-compatible microblogging server"
 arch=('i686' 'x86_64')
 url="https://mastodon.social"
 license=('AGPL-3.0')
-conflicts=("${pkgname}-git", "${pkgname}-docker", "${pkgname}-docker-git")
+conflicts=("${pkgname}-git" "${pkgname}-docker" "${pkgname}-docker-git")
 source=("https://github.com/tootsuite/${pkgname}/archive/v${pkgver}.tar.gz")
-sha256sums=('df6c1a33de5481eebe24b718708d942fc2f6f96bb7932bddcd3f053ab5870967')
+sha256sums=('e5b394a764710facb5830b7fad54a714aa08920017e6ecd02145bcbf70c5cded')
 _user=mastodon
 _homedir="/var/lib/${pkgname}"
 _shell="/bin/false"