diff options
author | Manuel Reimer | 2015-07-20 16:59:35 +0200 |
---|---|---|
committer | Manuel Reimer | 2015-07-20 16:59:35 +0200 |
commit | af89e3e3d4f4f283d8be0f70598066ee610824f0 (patch) | |
tree | 79d9e5f6f7cf3d6b698998b866cf8f7a607d757e | |
parent | 75594bf4aa12c18e549d4ea535641157eff6994e (diff) | |
download | aur-af89e3e3d4f4f283d8be0f70598066ee610824f0.tar.gz |
Updates to make PKGBUILD work with latest changes on merkaartor
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 6 |
2 files changed, 5 insertions, 5 deletions
@@ -1,8 +1,8 @@ # Generated by makepkg 4.2.1 -# Sun May 17 09:47:43 UTC 2015 +# Mon Jul 20 14:57:20 UTC 2015 pkgbase = merkaartor-git pkgdesc = Merkaartor openstreetmap mapping program - pkgver = 0.18.1.r144.gdcebd61 + pkgver = 0.18.2.r0.g59d30ce pkgrel = 1 url = http://www.merkaartor.be/ install = merkaartor-git.install @@ -1,6 +1,6 @@ _pkgname=merkaartor pkgname=$_pkgname-git -pkgver=0.18.1.r144.gdcebd61 +pkgver=0.18.2.r0.g59d30ce pkgrel=1 pkgdesc='Merkaartor openstreetmap mapping program' url='http://www.merkaartor.be/' @@ -16,14 +16,14 @@ conflicts=("$_pkgname") pkgver() { cd "$_pkgname" - git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g' + git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } build() { cd "$_pkgname" lrelease-qt5 src/src.pro qmake-qt5 -r PREFIX='/usr' - make release + make } package() { |