Numerous fixes

2 files changed, 13 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 68c7b4bd0f96..3f5179feab36 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Sun Mar 25 15:29:35 UTC 2018
 pkgbase = lz4json-git
 	pkgdesc = C decompress tool for mozilla lz4json format (development version)
-	pkgver = latest
+	pkgver = r5.gc44c510
 	pkgrel = 1
 	url = https://github.com/andikleen/lz4json
 	arch = i686
@@ -10,8 +8,7 @@ pkgbase = lz4json-git
 	makedepends = git
 	depends = lz4
 	provides = lz4json
-	source = git+git://github.com/andikleen/lz4json.git
+	source = git+https://github.com/andikleen/lz4json.git
 	md5sums = SKIP
 
 pkgname = lz4json-git
-
diff --git a/PKGBUILD b/PKGBUILD
index b8b137e5526a..713227edcb77 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,28 @@
-# Maintainer: Ivan Zenin <i.zenin@gmx.com>
-
+# Maintainer: Sich <little_sich@tuta.io>
+# Contributor: Ivan Zenin <i.zenin@gmx.com> 
 pkgname=lz4json-git
-pkgver=latest
+pkgver=r5.gc44c510
 pkgrel=1
 pkgdesc="C decompress tool for mozilla lz4json format (development version)"
 arch=('i686' 'x86_64')
 url="https://github.com/andikleen/lz4json"
-depends=("lz4")
+depends=('lz4')
 provides=('lz4json')
 makedepends=('git')
-source=("git+git://github.com/andikleen/lz4json.git")
+source=(git+https://github.com/andikleen/lz4json.git)
 md5sums=('SKIP')
 
 pkgver() {
   cd "${srcdir}"/lz4json
-  ( set -o pipefail
-    git describe --long --tags 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-  )
+  git describe --long --tags --abbrev=7 | sed 's/^v2-//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-package() {
+build() {
   cd "${srcdir}"/lz4json
   make lz4jsoncat
+}
+
+package() {
+  cd "${srcdir}"/lz4json
   install -Dm755 lz4jsoncat "${pkgdir}/usr/bin/lz4jsoncat"
-  find "${pkgdir}" -type d -name .git -exec rm -r '{}' +
 }