Fix pkgver() with chaging 0.19_pre tag
This commit is contained in:
parent
e9dfd57429
commit
929b6098c2
2 changed files with 6 additions and 5 deletions
4
.SRCINFO
4
.SRCINFO
|
@ -1,8 +1,8 @@
|
||||||
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.r2096.gc903de8af7
|
pkgver = 0.18.r2576.g953b802f83
|
||||||
pkgrel = 1
|
pkgrel = 1
|
||||||
epoch = 1
|
epoch = 2
|
||||||
url = https://www.freecadweb.org/
|
url = https://www.freecadweb.org/
|
||||||
arch = x86_64
|
arch = x86_64
|
||||||
license = LGPL
|
license = LGPL
|
||||||
|
|
7
PKGBUILD
7
PKGBUILD
|
@ -3,9 +3,9 @@
|
||||||
|
|
||||||
_appname=freecad
|
_appname=freecad
|
||||||
pkgname="${_appname}-git"
|
pkgname="${_appname}-git"
|
||||||
pkgver=0.19pre.r2096.gc903de8af7
|
pkgver=0.18.r2576.g953b802f83
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
epoch=1
|
epoch=2
|
||||||
pkgdesc='A general purpose 3D CAD modeler - git checkout'
|
pkgdesc='A general purpose 3D CAD modeler - git checkout'
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
url='https://www.freecadweb.org/'
|
url='https://www.freecadweb.org/'
|
||||||
|
@ -24,7 +24,8 @@ md5sums=('SKIP')
|
||||||
|
|
||||||
pkgver() {
|
pkgver() {
|
||||||
cd "${srcdir}/${pkgname}"
|
cd "${srcdir}/${pkgname}"
|
||||||
git describe --long --tags --match '*.*' | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/_//'
|
# upstream recyles the "pre" and "staging" tags so they do not produces stable commit counts
|
||||||
|
git describe --long --tags --exclude '*pre*' --exclude '*staging*' | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/_//'
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
|
|
Loading…
Reference in a new issue