summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBermond2016-04-06 17:19:28 -0300
committerBermond2016-04-06 17:19:28 -0300
commit45242a99f99f92ab73c06ae0e95ba52218bab788 (patch)
tree868ac836ef05c231bd0ec79d993e39d6372748ff
parentc142f400b8408ddd563b166c4dcfc69176afbd0d (diff)
downloadaur-45242a99f99f92ab73c06ae0e95ba52218bab788.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 'latest-version-<revision>-<hash>' to 'v<version>-<revision>-<hash>'. Adjusted versioning accordingly.
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD13
2 files changed, 10 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cb16d796327..d51b3072a78 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Wed Apr 6 19:32:07 UTC 2016
+# Wed Apr 6 20:19:11 UTC 2016
pkgbase = wine-staging-git
pkgdesc = A compatibility layer for running Windows programs (staging branch, Git version)
- pkgver = 1.9.6.r37.g0a391fa+wine.1.9.6.r144.g4315cae
- pkgrel = 2
+ pkgver = 1.9.7.r10.g1f66129+wine.1.9.7.r39.gf6c10b8
+ pkgrel = 1
url = https://github.com/wine-compholio/wine-staging/
install = wine-staging-git.install
arch = i686
@@ -134,9 +134,9 @@ pkgbase = wine-staging-git
optdepends = cups
optdepends = dosbox
optdepends = samba
- provides = wine=1.9.6.r144.g4315cae
- provides = wine-wow64=1.9.6.r144.g4315cae
- provides = wine-staging=1.9.6.r37.g0a391fa
+ provides = wine=1.9.7.r39.gf6c10b8
+ provides = wine-wow64=1.9.7.r39.gf6c10b8
+ provides = wine-staging=1.9.7.r10.g1f66129
provides = wine-git
conflicts = wine
conflicts = wine-wow64
diff --git a/PKGBUILD b/PKGBUILD
index 901c1025810..18b36d9ce24 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: Daniel Bermond < yahoo-com: danielbermond >
pkgname=wine-staging-git
-pkgver=1.9.6.r37.g0a391fa+wine.1.9.6.r144.g4315cae
-pkgrel=2
+pkgver=1.9.7.r10.g1f66129+wine.1.9.7.r39.gf6c10b8
+pkgrel=1
pkgdesc="A compatibility layer for running Windows programs (staging branch, Git version)"
arch=('i686' 'x86_64')
url="https://github.com/wine-compholio/wine-staging/"
@@ -110,13 +110,8 @@ pkgver() {
cd "${srcdir}"
printf "%s+%s" \
- "$(cd ${pkgname} && git describe --long \
- | sed 's/\([^-]*-g\)/r\1/;s/-/./g' \
- | sed -e "s/latest.release/$(git tag \
- | sort -hr \
- | head -1 \
- | cut -c2-)/g")" \
- "$(cd wine-git && git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g')"
+ "$(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')"
}
prepare() {