fix PKGBUILD and change versioning number

2 files changed, 9 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 803e04716a86..91926c49e66a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Nov 24 10:25:45 UTC 2017
+# Sat Dec  9 17:28:02 UTC 2017
 pkgbase = gnome-shell-extension-dash-to-panel-git
 	pkgdesc = Extension for GNOME shell to combine the dash and main panel
-	pkgver = r262.187ac72
+	pkgver = 11.r23.g9b5f264
 	pkgrel = 1
 	url = https://github.com/jderose9/dash-to-panel
 	install = gnome-shell-extension.install
@@ -12,6 +12,8 @@ pkgbase = gnome-shell-extension-dash-to-panel-git
 	makedepends = gnome-common
 	makedepends = intltool
 	depends = gnome-shell>=3.18
+	provides = gnome-shell-extension-dash-to-panel
+	conflicts = gnome-shell-extension-dash-to-panel
 	source = git+https://github.com/jderose9/dash-to-panel.git
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 337d885d663b..e0b093e189a9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Carl George < arch at cgtx dot us >
 
 pkgname=gnome-shell-extension-dash-to-panel-git
-pkgver=r262.187ac72
+pkgver=11.r23.g9b5f264
 pkgrel=1
 pkgdesc='Extension for GNOME shell to combine the dash and main panel'
 arch=(any)
@@ -12,14 +12,16 @@ _githubowner=jderose9
 url="https://github.com/${_githubowner}/${_githubname}"
 license=(GPL2)
 depends=('gnome-shell>=3.18')
-makedepends=(git gnome-common intltool)
+makedepends=('git' 'gnome-common' 'intltool')
+provides=("${pkgname%-git}")
+conflicts=("${pkgname%-git}")
 install='gnome-shell-extension.install'
 source=("git+${url}.git")
 sha256sums=('SKIP')
 
 pkgver() {
   cd "${srcdir}/${_githubname}"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {