diff options
author | Daniel Bermond | 2017-01-15 10:36:09 -0200 |
---|---|---|
committer | Daniel Bermond | 2017-01-15 10:36:09 -0200 |
commit | 05c257e7e8fd9547f64c21e2a8ceb5d4dbcb895a (patch) | |
tree | 99b34353dd8a721ad7544acb5186cc9b027c5cf3 | |
parent | 161085fecf8f79d00eef34239782c1a132ce4b2d (diff) | |
download | aur-05c257e7e8fd9547f64c21e2a8ceb5d4dbcb895a.tar.gz |
Adjust versioning according to change in upstream wine-staging git
Upstream wine-staging git has changed the string format returned by
the command 'git describe --long' from 'v<version>-<revision>-<hash>'
to 'latest-version-<revision>-<hash>'. Adjusted versioning accordingly.
I hope that this approach can work even if they change again to the
previous way.
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r-- | PKGBUILD | 16 |
2 files changed, 15 insertions, 11 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Sat Dec 3 17:04:32 UTC 2016 +# Sun Jan 15 12:33:19 UTC 2017 pkgbase = wine-staging-git pkgdesc = A compatibility layer for running Windows programs (staging branch, Git version) - pkgver = 1.9.23.r0.g5403b21+wine.1.9.23.r0.g02d7230 + pkgver = 2.0.rc4.r19.ga90497bd+wine.2.0.rc5.r0.g3c54d4fb69 pkgrel = 1 url = https://github.com/wine-compholio/wine-staging/ arch = i686 @@ -134,9 +134,9 @@ pkgbase = wine-staging-git optdepends = samba optdepends = dosbox optdepends = oss - provides = wine=1.9.23.r0.g02d7230 - provides = wine-wow64=1.9.23.r0.g02d7230 - provides = wine-staging=1.9.23.r0.g5403b21 + provides = wine=2.0.rc5.r0.g3c54d4fb69 + provides = wine-wow64=2.0.rc5.r0.g3c54d4fb69 + provides = wine-staging=2.0.rc4.r19.ga90497bd provides = wine-git conflicts = wine conflicts = wine-wow64 @@ -1,7 +1,7 @@ # Maintainer: Daniel Bermond < yahoo-com: danielbermond > pkgname=wine-staging-git -pkgver=1.9.23.r0.g5403b21+wine.1.9.23.r0.g02d7230 +pkgver=2.0.rc4.r19.ga90497bd+wine.2.0.rc5.r0.g3c54d4fb69 pkgrel=1 pkgdesc="A compatibility layer for running Windows programs (staging branch, Git version)" arch=('i686' 'x86_64') @@ -106,11 +106,15 @@ else fi pkgver() { - cd "${srcdir}" - - printf "%s+%s" \ - "$(cd ${pkgname} && git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g' | cut -c2-)" \ - "$(cd wine-git && git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g')" + cd "${srcdir}/${pkgname}" + _staging_tag="$(git tag | sort -r | head -n1 | sed 's/-/./g;s/^v//')" + _staging_version="$(git describe --long \ + | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//' \ + | sed "s/^latest.release/${_staging_tag}/")" + cd "${srcdir}/wine-git" + _wine_version="$(git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g')" + + printf "%s+%s" "$_staging_version" "$_wine_version" } prepare() { |