Fix pkgver to ignore weird upstream "Staging" tag

https://github.com/FreeCAD/FreeCAD/releases/tag/Staging
This commit is contained in:
Sebastiaan Lokhorst 2019-08-04 00:05:40 +02:00
parent 17758fac7f
commit 7562f5e671
2 changed files with 3 additions and 3 deletions

View file

@ -1,6 +1,6 @@
pkgbase = freecad-git pkgbase = freecad-git
pkgdesc = A general purpose 3D CAD modeler - git checkout pkgdesc = A general purpose 3D CAD modeler - git checkout
pkgver = 0.19pre.r633.g063582241 pkgver = 0.19pre.r1038.g7b315d3a1
pkgrel = 1 pkgrel = 1
epoch = 1 epoch = 1
url = https://www.freecadweb.org/ url = https://www.freecadweb.org/

View file

@ -3,7 +3,7 @@
_appname=freecad _appname=freecad
pkgname="${_appname}-git" pkgname="${_appname}-git"
pkgver=0.19pre.r633.g063582241 pkgver=0.19pre.r1038.g7b315d3a1
pkgrel=1 pkgrel=1
epoch=1 epoch=1
pkgdesc='A general purpose 3D CAD modeler - git checkout' pkgdesc='A general purpose 3D CAD modeler - git checkout'
@ -28,7 +28,7 @@ md5sums=('SKIP'
pkgver() { pkgver() {
cd "${srcdir}/${pkgname}" cd "${srcdir}/${pkgname}"
git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/_//' git describe --long --tags --match '*.*' | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/_//'
} }
build() { build() {