Change git to pull from 2.1 branch

1 files changed, 11 insertions, 7 deletions

diff --git a/PKGBUILD b/PKGBUILD
index f2821ff95889..38ce15e253d2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Joseph Brains <jnbrains@gmail.com>
 _pkgname=gns3-gui
 pkgname=${_pkgname}-git
-pkgver=2.1.8
+pkgver=v2.1.8.r4.gec0be9e2
 pkgrel=1
 pkgdesc='GNS3 network simulator. Graphical user interface package.'
 arch=('any')
@@ -9,7 +9,6 @@ url="https://github.com/GNS3/${_pkgname}"
 license=('GPL3')
 groups=('gns3')
 provides=('gns3-gui')
-replaces=('gns3-gui')
 conflicts=('gns3-gui')
 makedepends=('python-setuptools')
 depends=('python-jsonschema>=2.4.0' 'python-raven>=5.23.0' 'python-psutil>=2.2.1' 'python-pyqt5' 'qt5-websockets')
@@ -17,15 +16,20 @@ optdepends=('gns3-server-git: GNS3 backend. Manages emulators such as Dynamips,
             'dynamips: Cisco router emulator.'
             'xterm: Default terminal emulator for CLI management of virtual instances.'
             'wireshark-gtk: Live packet capture.')
-source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/GNS3/${_pkgname}/archive/v${pkgver}.tar.gz"
+source=("${_pkgname}::git+git://github.com/GNS3/${_pkgname}.git#branch=2.1"
         'gns3.desktop')
-sha256sums=('66465cfdbe6e64c40e112e815d1761b1bffc23ac990e5df77aea79b2ce851692'
+sha256sums=('SKIP'
             '51e6db5b47e6af3d008d85e8c597755369fafb75ddb2af9e79a441f943f4c166')
 
+pkgver() {
+    cd ${srcdir}/${_pkgname}
+    git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
 package() {
-    cd ${srcdir}/${_pkgname}-${pkgver}
+    cd ${srcdir}/${_pkgname}
     python setup.py install --root=${pkgdir} --optimize=1
     install -Dm644 ${srcdir}/gns3.desktop ${pkgdir}/usr/share/applications/gns3.desktop
-    install -Dm644 ${srcdir}/${_pkgname}-${pkgver}/resources/images/gns3_icon_256x256.png ${pkgdir}/usr/share/pixmaps/gns3.png
-    install -Dm644 ${srcdir}/${_pkgname}-${pkgver}/LICENSE ${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE
+    install -Dm644 ${srcdir}/${_pkgname}/resources/images/gns3_icon_256x256.png ${pkgdir}/usr/share/pixmaps/gns3.png
+    install -Dm644 ${srcdir}/${_pkgname}/LICENSE ${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE
 }