fixes build, unify packages as by upstream

1 files changed, 9 insertions, 6 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 6c1ac504c778..d6da4dc5b2c5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,22 +2,25 @@
 # Contributor: Frederic Bezies <fredbezies at gmail dot com>
 # Contributor: FadeMind <fademind@gmail.com>
 
-pkgname=papirus-icon-theme-gtk-git
-pkgver=20161129
+pkgname=papirus-icon-theme-git
+pkgver=r416.2d33bde
 pkgrel=1
-pkgdesc="Papirus icon theme for GTK (git version)"
+pkgdesc="Papirus icon theme (git version)"
 url="https://github.com/PapirusDevelopmentTeam/${pkgname%-git}"
 arch=('any')
 license=('LGPL3')
 makedepends=('git')
-conflicts=('papirus-gtk-icon-theme' 'papirus-gtk-icon-theme-git' 'papirus-icon-theme-gtk')
+conflicts=('papirus-gtk-icon-theme' 'papirus-gtk-icon-theme-git' 'papirus-icon-theme-gtk' 'papirus-icon-theme-gtk-git' 'papirus-icon-theme-kde' 'papirus-icon-theme-kde-git')
 options=('!strip')
 source=("${pkgname}::git+${url}.git")
 sha256sums=('SKIP')
 
 pkgver() {
-    cd ${pkgname}
-    git log -1 --format="%cd" --date=short | tr -d '-'
+  cd ${pkgname}
+  ( set -o pipefail
+    git describe --long --tag | sed -r 's/([^-]*-g)/r\1/;s/-/./g' ||
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  ) 2>/dev/null
 }
 
 package() {