2.8.3-4 Updated pkgver variable and function with changes to .sh launcher

3 files changed, 17 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 54f262df98f2..321fa046eec2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = qgis-ltr
 	pkgdesc = QGIS (long-term release) is a Geographic Information System (GIS) that supports vector, raster & database formats
-	pkgver = 2.8
-	pkgrel = 3
+	pkgver = 2.8.3
+	pkgrel = 4
 	url = http://qgis.org/
 	install = qgis-ltr.install
 	arch = i686
@@ -40,7 +40,7 @@ pkgbase = qgis-ltr
 	optdepends = fcgi: QGIS Map Server support
 	optdepends = osgearth: QGIS Globe plugin support
 	optdepends = gpsbabel: GPS toolbar support
-	provides = qgis=2.8
+	provides = qgis=2.8.3
 	source = qgis::git://github.com/qgis/QGIS.git#branch=release-2_8
 	source = qgis-ltr.png
 	source = qgis-ltr.sh
diff --git a/PKGBUILD b/PKGBUILD
index dc98650e9771..edf2ca465b9f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,8 +11,8 @@
 pkgname=qgis-ltr
 _pkgname=${pkgname//-ltr}
 _pkgver=2.8
-pkgver=2.8
-pkgrel=3
+pkgver=2.8.3
+pkgrel=4
 pkgdesc='QGIS (long-term release) is a Geographic Information System (GIS) that supports vector, raster & database formats'
 url='http://qgis.org/'
 license=('GPL')
@@ -62,11 +62,17 @@ md5sums=('SKIP'
          '5bac82b00870c491056cd8705be482f0'
          '57efd9c869ed2d0a50fb7cf35048d99d')
 
-pkgver() {
-  cd $_pkgname
 
-  printf "%s.r%s" "${_pkgver}" "$(git rev-list --count HEAD)"
+pkgver() {
+  cd "$_pkgname"
+  # cutting off 'final' prefix that presents in the git tag
+  git describe --long | sed 's/^final-//;s/\([^-]*-g\)/r\1/;s/-/./g;s/_/./g'
 }
+#pkgver() {
+#  cd $_pkgname
+#
+#  printf "%s.r%s" "${_pkgver}" "$(git rev-list --count HEAD)"
+#}
 
 prepare() {
    cd $_pkgname
@@ -160,6 +166,8 @@ package() {
   #  "$pkgdir/usr/share/pixmaps/qbrowser-ltr.png"
 
   # rename executables so they don't conflict with qgis or qgis-ltr
+  mv $pkgdir/opt/$pkgname/bin/$_pkgname $pkgdir/opt/$pkgname/bin/$pkgname
+
   install -Dm755 $srcdir/$pkgname.sh \
     $pkgdir/usr/bin/$pkgname
 
diff --git a/qgis-ltr.sh b/qgis-ltr.sh
index cb80b86e2ad0..07a43f91d190 100755
--- a/qgis-ltr.sh
+++ b/qgis-ltr.sh
@@ -2,4 +2,4 @@
 
 QGIS_PREFIX_PATH=/opt/qgis-ltr
 
-/opt/qgis-ltr/bin/qgis --configpath $HOME/.qgis2-ltr
\ No newline at end of file
+/opt/qgis-ltr/bin/qgis-ltr --configpath $HOME/.qgis2-ltr
\ No newline at end of file