2.8-2, removed conflicting packages and update pkgver function

2 files changed, 4 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6c9165050443..434ea52b0638 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 = 1
+	pkgrel = 2
 	url = http://qgis.org/
 	install = qgis-ltr.install
 	arch = i686
@@ -40,9 +40,7 @@ pkgbase = qgis-ltr
 	optdepends = osgearth: QGIS Globe plugin support
 	optdepends = gpsbabel: GPS toolbar support
 	provides = qgis=2.8
-	conflicts = qgis-git
 	conflicts = qgis
-	conflicts = qgis-ltr
 	source = qgis::git://github.com/qgis/QGIS.git#branch=release-2_8
 	source = https://raw.githubusercontent.com/Ariki/QGIS/support-configure-ng/python/console/console.py
 	md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index a057a04c4696..10615d48d58b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -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() {