diff options
author | SaultDon | 2015-08-19 21:02:13 -0700 |
---|---|---|
committer | SaultDon | 2015-08-19 21:02:13 -0700 |
commit | 44b13be7129a9d2141d9122abb1695e2b6c64207 (patch) | |
tree | 84dadb6a5d710dfe28b0713fd77b4c9a8f6833d4 /PKGBUILD | |
parent | b604e99fe31b93e2b4d5359144ba53921c70b60a (diff) | |
download | aur-44b13be7129a9d2141d9122abb1695e2b6c64207.tar.gz |
2.8-2, removed conflicting packages and update pkgver function
Diffstat (limited to 'PKGBUILD')
-rw-r--r-- | PKGBUILD | 9 |
1 files changed, 3 insertions, 6 deletions
@@ -12,7 +12,7 @@ pkgname=qgis-ltr _pkgname=${pkgname//-ltr} _pkgver=2.8 pkgver=2.8 -pkgrel=1 +pkgrel=2 pkgdesc='QGIS (long-term release) is a Geographic Information System (GIS) that supports vector, raster & database formats' url='http://qgis.org/' license=('GPL') @@ -51,7 +51,7 @@ optdepends=('grass: GRASS plugin support' # Uncomment relevant cmake o 'osgearth: QGIS Globe plugin support' # or the Globe Plugin enabled 'gpsbabel: GPS toolbar support') provides=("$_pkgname=$pkgver") -conflicts=("$_pkgname-git" "$_pkgname" "$pkgname") +conflicts=("$_pkgname") install="$pkgname.install" source=("${_pkgname}::git://github.com/qgis/QGIS.git#branch=release-${_pkgver//./_}" "https://raw.githubusercontent.com/Ariki/QGIS/support-configure-ng/python/console/console.py") @@ -60,10 +60,7 @@ md5sums=('SKIP' pkgver() { cd "$srcdir/$_pkgname" - ( set -o pipefail - git describe --long --tags 2>/dev/null | sed 's/^final.//;s/\([^-]*-g\)/r\1/;s/-/./g;s/_/./g' || - printf "%s.r%s.%s" "${_pkgver}" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" - ) + printf "%s.r%s" "${_pkgver}" "$(git rev-list --count HEAD)" } prepare() { |