packaging fixes, and set epoch=1 due to wrong pkgver

2 files changed, 22 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6ba47a6290c3..d64ec44a499b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = epub-thumbnailer-git
-	pkgdesc = Creates thumbnail for EPUB files.
-	pkgver = 1.0r67.c82fe3f
+	pkgdesc = EPUB e-books thumbnailer for file managers that make use of python-pillow
+	pkgver = r74.486111b
 	pkgrel = 1
+	epoch = 1
 	url = https://github.com/marianosimone/epub-thumbnailer
 	arch = any
 	license = GPL3
 	makedepends = git
-	depends = python-pillow
-	source = git://github.com/marianosimone/epub-thumbnailer.git
+	source = epub-thumbnailer::git+https://github.com/marianosimone/epub-thumbnailer.git
 	md5sums = SKIP
 
 pkgname = epub-thumbnailer-git
-
+	depends = python-pillow
diff --git a/PKGBUILD b/PKGBUILD
index 03c49f09911b..49cd525cc409 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,29 @@
 # Maintainer: tinywrkb <tinywrkb@gmail.com>
 # Contributor: Benoît Giraudou <bgiraudou@gmail.com>
+
 pkgname=epub-thumbnailer-git
-_gitname=epub-thumbnailer
-pkgver=1.0r67.c82fe3f
+pkgver=r74.486111b
 pkgrel=1
-pkgdesc="Creates thumbnail for EPUB files."
-arch=('any')
+epoch=1
+pkgdesc="EPUB e-books thumbnailer for file managers that make use of python-pillow"
+arch=(any)
 url="https://github.com/marianosimone/epub-thumbnailer"
-license=('GPL3')
-depends=('python-pillow')
-makedepends=('git')
-source=('git://github.com/marianosimone/epub-thumbnailer.git')
+license=(GPL3)
+makedepends=(git)
+source=("epub-thumbnailer::git+https://github.com/marianosimone/epub-thumbnailer.git")
 md5sums=('SKIP')
 
 pkgver() {
-	cd "$_gitname"
-  	printf "1.0r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd epub-thumbnailer
+  ( set -o pipefail
+    git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  )
 }
 
 package() {
-  	cd "$_gitname"
-  	install -dm755 ${pkgdir}/usr/bin/
-  	install -m755 src/epub-thumbnailer.py ${pkgdir}/usr/bin/epub-thumbnailer
-  	install -dm755 ${pkgdir}/usr/share/thumbnailers/
-  	install -m644 src/epub.thumbnailer ${pkgdir}/usr/share/thumbnailers/
+  depends+=(python-pillow)
+  cd epub-thumbnailer
+  install -Dm755 src/epub-thumbnailer.py "${pkgdir}/usr/bin/epub-thumbnailer"
+  install -Dm644 src/epub.thumbnailer -t "${pkgdir}/usr/share/thumbnailers/"
 }