1 files changed, 15 insertions, 16 deletions
diff --git a/pcr/pybitmessage-git/PKGBUILD b/pcr/pybitmessage-git/PKGBUILD
index e6cad32b3..a62d45523 100644
--- a/pcr/pybitmessage-git/PKGBUILD
+++ b/pcr/pybitmessage-git/PKGBUILD
@@ -3,11 +3,10 @@
 # Contributor: Asta <gatien.bovyn@gmail.com>
 # Contributor: ptrv <mail@petervasil.net>
 
-pkgname=pybitmessage-git
-_gitname='PyBitmessage'
-_realname='pybitmessage'
-pkgver=7ad8ce7
-pkgrel=2
+_pkgname=pybitmessage
+pkgname=${_pkgname}-git
+pkgver=0.4.2.r7.g44f31d7
+pkgrel=1
 pkgdesc="Bitcoin inspired P2P encrypted messenger"
 arch=('any')
 depends=('hicolor-icon-theme' 'python2' 'python2-pyqt' 'qt4')
@@ -15,7 +14,7 @@ makedepends=('git')
 optdepends=('python2-gevent')
 url="https://github.com/Bitmessage/PyBitmessage"
 license=('MIT')
-source=(git+https://github.com/Bitmessage/PyBitmessage
+source=($pkgname::git+https://github.com/Bitmessage/PyBitmessage
         pybitmessage.sh)
 sha256sums=('SKIP'
             'c20eeeffd4931d8bcd50de5e6e1a974323ebbd3f5ad1d34483c6adeb3b5f3ae1')
@@ -23,12 +22,12 @@ provides=('pybitmessage')
 conflicts=('pybitmessage')
 
 pkgver() {
-  cd $_gitname
-  git describe --always | sed 's|-|.|g'
+  cd $pkgname
+  git describe --long --tags | sed -r 's/^v//;s/([^-]*-g)/r\1/;s/-/./g'
 }
 
 prepare() {
-  cd $_gitname
+  cd $pkgname
 
   msg 'Fixing Python version...'
   find . -type f -print0 | xargs -0 sed -i 's#/usr/bin/python#/usr/bin/python2#g'
@@ -36,17 +35,17 @@ prepare() {
 }
 
 package() {
-  cd $_gitname
+  cd $pkgname
 
   msg 'Installing shared files...'
-  mkdir -p "$pkgdir"/usr/share/${_realname}
-  cp -R src/* "$pkgdir"/usr/share/${_realname}
+  mkdir -p "$pkgdir"/usr/share/${_pkgname}
+  cp -R src/* "$pkgdir"/usr/share/${_pkgname}
 
   msg 'Installing desktop icons...'
-  install -D -m644 desktop/${_realname}.desktop "${pkgdir}/usr/share/applications/${_realname}.desktop"
-  install -D -m644 src/images/can-icon-24px.png "${pkgdir}/usr/share/icons/hicolor/24x24/apps/${_realname}.png"
-  install -D -m644 desktop/can-icon.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_realname}.svg"
-  install -D -m644 desktop/can-icon.svg "${pkgdir}/usr/share/pixmaps/${_realname}.svg"
+  install -D -m644 desktop/${_pkgname}.desktop "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
+  install -D -m644 src/images/can-icon-24px.png "${pkgdir}/usr/share/icons/hicolor/24x24/apps/${_pkgname}.png"
+  install -D -m644 desktop/can-icon.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.svg"
+  install -D -m644 desktop/can-icon.svg "${pkgdir}/usr/share/pixmaps/${_pkgname}.svg"
 
   msg 'Installing executable...'
   install -D -m755 ${srcdir}/pybitmessage.sh "${pkgdir}/usr/bin/pybitmessage"