upgpkg: python-hamster-lib-git 0.13.1.r32.gea3ec9a-1

2 files changed, 29 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 73382dff0db1..8835ae6c8ee9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,11 @@
 pkgbase = python-hamster-lib-git
 	pkgdesc = A library for common timetracking functionality
-	pkgver = 0.13.1.r20.gbc34c82
+	pkgver = 0.13.1.r32.gea3ec9a
 	pkgrel = 1
 	url = https://github.com/projecthamster/hamster-lib
 	arch = any
 	license = GPL3
+	makedepends = git
 	makedepends = python-setuptools
 	depends = python
 	depends = python-appdirs
@@ -14,8 +15,7 @@ pkgbase = python-hamster-lib-git
 	depends = python-six
 	provides = python-hamster-lib
 	conflicts = python-hamster-lib
-	source = git://github.com/projecthamster/hamster-lib.git#branch=develop
+	source = hamster-lib::git+https://github.com/projecthamster/hamster-lib.git#branch=develop
 	sha256sums = SKIP
 
 pkgname = python-hamster-lib-git
-
diff --git a/PKGBUILD b/PKGBUILD
index f24231cbfa05..008afaa923e4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,41 @@
-# Maintainer:  Caleb Maclennan <caleb@alerque.com>
+# Maintainer: Caleb Maclennan <caleb@alerque.com>
 # Contributor: Jan Tojnar <jtojnar@gmail.com>
 
-_pkgname='hamster-lib'
+_pkgname=hamster-lib
 pkgname="python-$_pkgname-git"
-_branch='develop'
-pkgver=0.13.1.r20.gbc34c82
+_branch=develop
+pkgver=0.13.1.r32.gea3ec9a
 pkgrel=1
-pkgdesc="A library for common timetracking functionality"
-url="https://github.com/projecthamster/hamster-lib"
-depends=('python' 'python-appdirs' 'python-future' 'python-icalendar' 'python-sqlalchemy' 'python-six')
-makedepends=('python-setuptools')
+pkgdesc='A library for common timetracking functionality'
+arch=(any)
+url="https://github.com/projecthamster/$_pkgname"
+license=(GPL3)
+depends=(python
+         python-appdirs
+         python-future
+         python-icalendar
+         python-sqlalchemy
+         python-six)
+makedepends=(git
+             python-setuptools)
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
-license=('GPL3')
-arch=('any')
-source=("git://github.com/projecthamster/$_pkgname.git#branch=$_branch")
+source=("$_pkgname::git+$url.git#branch=$_branch")
 sha256sums=('SKIP')
 
 pkgver() {
 	cd "$_pkgname"
-    git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+	git describe --always --long --tags --abbrev=7 HEAD |
+		sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-package() {
+prepare() {
 	cd "$_pkgname"
 	sed -i -e 's/find_packages()/find_packages(exclude=["tests"])/;s/.*configparser.*//g' setup.py
-    sed -i -e 's!setup.py install!setup.py install --root="$(DESTDIR)"!g' Makefile
-    make install DESTDIR="$pkgdir/"
+	sed -i -e 's!setup.py install!setup.py install --root="$(DESTDIR)"!g' Makefile
+}
+
+package() {
+	cd "$_pkgname"
+	make install DESTDIR="$pkgdir/"
 }