Make this package the bleeding edge package

2 files changed, 26 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 46ad3c7bd01d..eec9fc0d1b24 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = freshfetch-git
 	pkgdesc = A fresh take on Neofetch
-	pkgver = 0.1.2
-	pkgrel = 3
+	pkgver = v0.1.2.r6.g093e489
+	pkgrel = 1
 	url = https://github.com/K4rakara/freshfetch
 	arch = any
 	license = MIT
@@ -12,8 +12,11 @@ pkgbase = freshfetch-git
 	optdepends = xorg-xwininfo
 	provides = freshfetch
 	conflicts = freshfetch
+	conflicts = freshfetch-git
 	source = git://github.com/K4rakara/freshfetch.git
+	source = https://raw.githubusercontent.com/K4rakara/freshfetch/master/LICENSE.md
 	md5sums = SKIP
+	md5sums = a4c191c500e67564935777e1abaebbab
 
 pkgname = freshfetch-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 0b29aaa17b3b..d81e069028b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Jack Johannesen <jack AT insertdomain DOT name>
 
 pkgname="freshfetch-git"
-pkgver=0.1.2
-pkgrel=3
+pkgver=v0.1.2.r6.g093e489
+pkgrel=1
 pkgdesc="A fresh take on Neofetch"
 arch=('any')
 url="https://github.com/K4rakara/freshfetch"
@@ -12,19 +12,32 @@ depends=('luajit')
 makedepends=('cargo' 'git')
 optdepends=('xorg-xrandr' 'xorg-xwininfo')
 provides=('freshfetch')
-conflicts=('freshfetch')
-source=('git://github.com/K4rakara/freshfetch.git')
-md5sums=('SKIP')
+conflicts=('freshfetch' 'freshfetch-git')
+source=('git://github.com/K4rakara/freshfetch.git'
+        "https://raw.githubusercontent.com/K4rakara/${pkgname//-git}/master/LICENSE.md")
+md5sums=('SKIP'
+         'a4c191c500e67564935777e1abaebbab')
+
+pkgver() {
+  cd $srcdir/freshfetch/;
+  git describe --tags --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g';  
+}
 
 build() {
-  cd "$srcdir/freshfetch/";
+  cd $srcdir/freshfetch/;
   cargo build \
     --release \
-	--locked \
 	-vv;
 }
 
 package() {
-  install -Dm 755 "$srcdir/${pkgname//-git}/target/release/${pkgname//-git}" -t "$pkgdir/usr/bin";
+  install \
+    -Dm755 \
+	$srcdir/${pkgname//-git}/target/release/${pkgname//-git} \
+	$pkgdir/usr/bin/${pkgname//-git};
+  install \
+    -Dm644 \
+    $srcdir/LICENSE.md \
+    $pkgdir/usr/bin/licenses/${pkgname}/LICENSE;
 }