summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaleb Maclennan2017-04-11 16:19:26 +0300
committerCaleb Maclennan2017-04-11 16:19:26 +0300
commit376a6e3894e08feecb43e30a203d877ce9c9c0d1 (patch)
tree4e10e9e5a9f06c8dbcecc17850c5e555f0b4657b
parent7f7ed9e1c7989c7e749a6f570b65466c2f3b6123 (diff)
downloadaur-376a6e3894e08feecb43e30a203d877ce9c9c0d1.tar.gz
Bump version and fix conflicts syntax
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD8
2 files changed, 9 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b067c7f4b1ee..299b1d9072bc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
# Generated by mksrcinfo v8
-# Fri Apr 7 10:11:56 UTC 2017
+# Tue Apr 11 13:18:56 UTC 2017
pkgbase = mastodon-docker-git
pkgdesc = A GNU Social-compatible microblogging server
- pkgver = 1.0_584_g1c351709
+ pkgver = 1.1.1_29_gc35bda05
pkgrel = 0.1
url = https://mastodon.social
arch = i686
arch = x86_64
license = AGPL-3.0
- conflicts = mastodon,
- conflicts = mastodon-git,
+ conflicts = mastodon
+ conflicts = mastodon-git
conflicts = mastodon-docker
- source = git://github.com/tootsuite/mastodon-docker.git#branch=master
+ source = git://github.com/tootsuite/mastodon.git#branch=master
sha256sums = SKIP
pkgname = mastodon-docker-git
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'
}