summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authornl67202018-12-13 18:17:12 +0200
committernl67202018-12-13 18:17:12 +0200
commit295298ef5e2e8261970bbc2eb23a47bc6995fb46 (patch)
tree690dffb368f2a084a87dc1f51a32b5e6fd2b05bf
parente94a13ed1a02a394f62320e3dd87c52604995754 (diff)
downloadaur-295298ef5e2e8261970bbc2eb23a47bc6995fb46.tar.gz
Fix pkgver
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD6
2 files changed, 5 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 73e6219267d6..50084e8d0e3f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = miredo
pkgdesc = Teredo client and server.
- pkgver = 1.2.6+149+g5db176c
+ pkgver = 1.2.6+r149+g5db176c
pkgrel = 1
url = https://www.remlab.net/miredo/
arch = x86_64
@@ -13,6 +13,7 @@ pkgbase = miredo
backup = etc/miredo/miredo-server.conf
backup = etc/miredo/client-hook
source = git+http://git.remlab.net/git/miredo.git#commit=5db176c6aae10fe3d743738244c82f0b52f80cd7
+ validpgpkeys = 9480583353E334D2F03FE80CC3EC6DBEDD6D12BD
sha512sums = SKIP
pkgname = miredo
diff --git a/PKGBUILD b/PKGBUILD
index 24f78909ff59..bbbb9d6addff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=miredo
-pkgver=1.2.6+149+g5db176c
+pkgver=1.2.6+r149+g5db176c
pkgrel=1
_commit='5db176c6aae10fe3d743738244c82f0b52f80cd7'
pkgdesc='Teredo client and server.'
@@ -14,14 +14,14 @@ makedepends=('git')
backup=('etc/miredo/miredo.conf'
'etc/miredo/miredo-server.conf'
'etc/miredo/client-hook')
-#validpgpkeys=('9480583353E334D2F03FE80CC3EC6DBEDD6D12BD') # Rémi Denis-Courmont
+validpgpkeys=('9480583353E334D2F03FE80CC3EC6DBEDD6D12BD') # Rémi Denis-Courmont
#source=("http://www.remlab.net/files/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,'.asc'})
source=("git+http://git.remlab.net/git/miredo.git#commit=${_commit}")
sha512sums=('SKIP')
pkgver() {
cd "${pkgname}"
- git describe --tags | sed 's/-/+/g'
+ git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/+/g'
}
build() {