Use dev branch

2 files changed, 20 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b5e6edd89aa8..4016d72b795e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,16 @@
 pkgbase = zerotier-one-git
-        pkgdesc = Creates virtual Ethernet networks of almost unlimited size.
-        pkgver = 1.2.12
-        pkgrel = 1
-        url = https://www.zerotier.com/index.html
-        arch = x86_64
-        license = GPL3
-        makedepends = ruby-ronn
-        depends = gcc-libs
-        depends = libnatpmp
-        depends = miniupnpc
-        conflicts = zerotier-one
-        source = git+git://github.com/zerotier/ZeroTierOne.git
-        sha512sums = SKIP
+	pkgdesc = Creates virtual Ethernet networks of almost unlimited size.
+	pkgver = pkgver
+	pkgrel = 1
+	url = https://www.zerotier.com/index.html
+	arch = x86_64
+	license = GPL3
+	makedepends = ruby-ronn
+	depends = gcc-libs
+	depends = libnatpmp
+	depends = miniupnpc
+	source = git+git://github.com/zerotier/ZeroTierOne.git#branch=dev
+	sha512sums = SKIP
 
 pkgname = zerotier-one-git
+
diff --git a/PKGBUILD b/PKGBUILD
index ef349f8a85e5..84cdb74211ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Brian Clemens <brian@tiuxo.com>
 
 pkgname=zerotier-one-git
-pkgver=1.2.12
+pkgver=pkgver
 pkgrel=1
 pkgdesc="Creates virtual Ethernet networks of almost unlimited size."
 arch=('x86_64')
@@ -9,8 +9,8 @@ url="https://www.zerotier.com/index.html"
 license=('GPL3')
 depends=('gcc-libs' 'libnatpmp' 'miniupnpc')
 makedepends=('ruby-ronn')
-conflicts=('zerotier-one')
-source=("git+git://github.com/zerotier/ZeroTierOne.git")
+conflics=('zerotier-one')
+source=("git+git://github.com/zerotier/ZeroTierOne.git#branch=dev")
 sha512sums=('SKIP')
 
 prepare() {
@@ -35,3 +35,7 @@ package() {
   install -Dm644 debian/zerotier-one.service "$pkgdir"/usr/lib/systemd/system/zerotier-one.service
 }
 
+pkgver() {
+  cd ZeroTierOne
+  git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}