updated pkgver

2 files changed, 21 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 115e89641d9f..d39b63c5ee2a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = git-nautilus-icons-git
-	pkgver = r42.95b65d3
+	pkgver = 1.0.0.r26.95b65d3
 	pkgrel = 1
 	url = https://github.com/chrisjbillington/git_nautilus_icons
 	arch = x86_64
@@ -19,7 +19,9 @@ pkgname = git-nautilus-icons-py2-git
 	pkgdesc = A Nautilus Python 2 extension to overlay icons on files in git repositories
 	depends = python2-gobject
 	depends = python2-nautilus
+	provides = git-nautilus-icons-py2
 	provides = git-nautilus-icons
+	conflicts = git-nautilus-icons-py2
 	conflicts = git-nautilus-icons
 
 pkgname = git-nemo-icons-git
diff --git a/PKGBUILD b/PKGBUILD
index 3931c38c9712..570adbf8d017 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Mark Wagie <yochanan dot marqos at gmail dot com>
 pkgname=('git-nautilus-icons-git' 'git-nautilus-icons-py2-git' 'git-nemo-icons-git' 'git-caja-icons-git')
 pkgbase=git-nautilus-icons-git
-pkgver=r42.95b65d3
+pkgver=1.0.0.r26.95b65d3
 pkgrel=1
 arch=('x86_64' 'i686')
 url="https://github.com/chrisjbillington/git_nautilus_icons"
@@ -11,7 +11,7 @@ sha256sums=('SKIP')
 
 pkgver() {
 	cd "$srcdir/git_nautilus_icons"
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	printf "%s" "$(git describe --long --tags | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
 }
 
 package_git-nautilus-icons-git() {
@@ -23,45 +23,49 @@ package_git-nautilus-icons-git() {
 	cd "$srcdir/git_nautilus_icons"
 	install -d $pkgdir/usr/share/{icons,nautilus-python/extensions}
 	cp -r icons/hicolor $pkgdir/usr/share/icons
-	install -Dm644 "${pkgbase%-git}.py" "$pkgdir/usr/share/nautilus-python/extensions/${pkgbase%-git}.py"
+	install -Dm644 "${pkgbase%-git}.py" \
+		"$pkgdir/usr/share/nautilus-python/extensions/${pkgbase%-git}.py"
 	install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/${pkgbase%-git}/LICENSE"
 }
 
 package_git-nautilus-icons-py2-git() {
 	pkgdesc="A Nautilus Python 2 extension to overlay icons on files in git repositories"
 	depends=('python2-gobject' 'python2-nautilus')
-	provides=("${pkgbase%-git}")
-	conflicts=("${pkgbase%-git}")
+	provides=("${pkgname%-git}" "${pkgbase%-git}")
+	conflicts=("${pkgname%-git}" "${pkgbase%-git}")
 
 	cd "$srcdir/git_nautilus_icons"
 	install -d $pkgdir/usr/share/{icons,nautilus-python/extensions}
 	cp -r icons/hicolor $pkgdir/usr/share/icons
-	install -Dm644 "${pkgbase%-git}.py" "$pkgdir/usr/share/nautilus-python/extensions/${pkgbase%-git}.py"
+	install -Dm644 "${pkgbase%-git}.py" \
+		"$pkgdir/usr/share/nautilus-python/extensions/${pkgbase%-git}.py"
 	install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/${pkgbase%-git}/LICENSE"
 }
 
 package_git-nemo-icons-git() {
 	pkgdesc="A Nemo Python extension to overlay icons on files in git repositories"
 	depends=('python-gobject' 'nemo-python')
-	provides=(git-nemo-icons)
-	conflicts=(git-nemo-icons)
+	provides=("${pkgname%-git}")
+	conflicts=("${pkgname%-git}")
 
 	cd "$srcdir/git_nautilus_icons"
 	install -d $pkgdir/usr/share/{icons,nemo-python/extensions}
 	cp -r icons/hicolor $pkgdir/usr/share/icons
-	install -Dm644 "${pkgbase%-git}.py" "$pkgdir/usr/share/nemo-python/extensions/git-nemo-icons.py"
-	install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/git-nemo-icons/LICENSE"
+	install -Dm644 "${pkgbase%-git}.py" \
+		"$pkgdir/usr/share/nemo-python/extensions/${pkgname%-git}.py"
+	install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/${pkgname%-git}/LICENSE"
 }
 
 package_git-caja-icons-git() {
 	pkgdesc="A Caja Python extension to overlay icons on files in git repositories"
 	depends=('python2-gobject' 'python2-caja')
-	provides=(git-caja-icons)
-	conflicts=(git-caja-icons)
+	provides=("${pkgname%-git}")
+	conflicts=("${pkgname%-git}")
 
 	cd "$srcdir/git_nautilus_icons"
 	install -d $pkgdir/usr/share/{icons,caja-python/extensions}
 	cp -r icons/hicolor $pkgdir/usr/share/icons
-	install -Dm644 "${pkgbase%-git}.py" "$pkgdir/usr/share/caja-python/extensions/git-caja-icons.py"
-	install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/git-caja-icons/LICENSE"
+	install -Dm644 "${pkgbase%-git}.py" \
+		"$pkgdir/usr/share/caja-python/extensions/${pkgname%-git}.py"
+	install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/${pkgname%-git}/LICENSE"
 }