Change git to pull from the master branch

2 files changed, 21 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1f027ee5eab1..f878a658171d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 pkgbase = ubridge-git
 	pkgdesc = Bridge for UDP tunnels, Ethernet, TAP and VMnet interfaces.
-	pkgver = 0.9.14
+	pkgver = v0.9.14.r11.g634062b
 	pkgrel = 1
 	url = https://github.com/GNS3/ubridge
 	install = ubridge.install
-	arch = i686
-	arch = x86_64
+	arch = any
 	groups = gns3
 	license = GPL3
+	makedepends = git
 	makedepends = gcc
 	depends = libpcap
 	provides = ubridge
 	conflicts = ubridge
-	source = ubridge-0.9.14.tar.gz::https://github.com/GNS3/ubridge/archive/v0.9.14.tar.gz
-	sha256sums = d28538f15c02e7b889872a7478400855d5b9d9d26b0bdad621a0cc89395a3bc2
+	source = ubridge::git+git://github.com/GNS3/ubridge.git
+	sha256sums = SKIP
 
 pkgname = ubridge-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 06cdb14a10d4..fda2fe0c4c69 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,34 @@
 # Maintainer: Joseph Brains <jnbrains@gmail.com>
 _pkgname=ubridge
 pkgname=${_pkgname}-git
-pkgver=0.9.14
+pkgver=v0.9.14.r11.g634062b
 pkgrel=1
 pkgdesc='Bridge for UDP tunnels, Ethernet, TAP and VMnet interfaces.'
-arch=('i686' 'x86_64')
+arch=('any')
 url="https://github.com/GNS3/${_pkgname}"
 license=('GPL3')
 groups=('gns3')
 depends=('libpcap')
-makedepends=('gcc')
+makedepends=('git' 'gcc')
 provides=("${_pkgname}")
 conflicts=("${_pkgname}")
-source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/GNS3/${_pkgname}/archive/v${pkgver}.tar.gz")
+source=("${_pkgname}::git+git://github.com/GNS3/${_pkgname}.git")
 install="${_pkgname}.install"
-sha256sums=('d28538f15c02e7b889872a7478400855d5b9d9d26b0bdad621a0cc89395a3bc2')
+sha256sums=('SKIP')
+
+pkgver() {
+    cd $srcdir/${_pkgname}
+    git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
 
 build() {
-  cd $srcdir/${_pkgname}-$pkgver
-  make
+    cd $srcdir/${_pkgname}
+    make
 }
 
 package() {
-  install -Dm755 ${srcdir}/${_pkgname}-${pkgver}/${_pkgname} ${pkgdir}/usr/bin/${_pkgname}
-  install -dm755 ${pkgdir}/usr/share/doc/${_pkgname}
-  install -m644 ${srcdir}/${_pkgname}-${pkgver}/README.rst -t ${pkgdir}/usr/share/doc/${_pkgname}
-  install -Dm644 ${srcdir}/${_pkgname}-${pkgver}/LICENSE ${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE
+    install -Dm755 ${srcdir}/${_pkgname}/${_pkgname} ${pkgdir}/usr/bin/${_pkgname}
+    install -dm755 ${pkgdir}/usr/share/doc/${_pkgname}
+    install -m644 ${srcdir}/${_pkgname}/README.rst -t ${pkgdir}/usr/share/doc/${_pkgname}
+    install -Dm644 ${srcdir}/${_pkgname}/LICENSE ${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE
 }