upgpkg

2 files changed, 8 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 678d35cd4a2f..bb88399ab5d0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Jan  9 08:19:18 UTC 2017
+# Tue Jan 17 02:41:27 UTC 2017
 pkgbase = simple-obfs-git
 	pkgdesc = A simple obfusacting tool, designed as plugin server of shadowsocks.
-	pkgver = r9.4461e1f
+	pkgver = v0.0.2.r14.g6956a6a
 	pkgrel = 1
 	url = https://github.com/shadowsocks/simple-obfs
 	arch = x86_64
@@ -10,6 +10,8 @@ pkgbase = simple-obfs-git
 	depends = libsodium
 	depends = libev
 	depends = udns
+	provides = simple-obfs
+	conflicts = simple-obfs
 	source = git+https://github.com/shadowsocks/simple-obfs.git
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index c88fd610c028..9cc0597a7db5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,18 +3,20 @@
 _pkgname="simple-obfs"
 pkgname="simple-obfs-git"
 pkgdesc="A simple obfusacting tool, designed as plugin server of shadowsocks."
-pkgver=r9.4461e1f
+pkgver=v0.0.2.r14.g6956a6a
 pkgrel=1
 arch=(x86_64)
 license=("GPL3")
 url="https://github.com/shadowsocks/simple-obfs"
 source=("git+https://github.com/shadowsocks/simple-obfs.git")
 depends=('libsodium' 'libev' 'udns')
+provides=("simple-obfs")
+conflicts=("simple-obfs")
 
 pkgver() {
     cd "$_pkgname"
     ( set -o pipefail
-      git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+      git describe --tags --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
       printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
     )
 }