Follow current Rust package guidelines

2 files changed, 15 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ed61057bcf13..8f6b1c6eb798 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = comrak-git
 	pkgdesc = CommonMark + GFM compatible Markdown parser and renderer
 	pkgver = 0.11.0.r1.g49eef43
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/kivikakk/comrak
 	arch = x86_64
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index b79b168ea491..4c136e81fdc3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=comrak-git
 pkgver=0.11.0.r1.g49eef43
-pkgrel=1
+pkgrel=2
 pkgdesc='CommonMark + GFM compatible Markdown parser and renderer'
 arch=(x86_64 i686)
 url="https://github.com/kivikakk/${pkgname%-git}"
@@ -15,29 +15,33 @@ source=("git+$url.git")
 sha256sums=('SKIP')
 
 pkgver() {
-    cd "${pkgname%-git}"
-    git describe --long --always --tags --abbrev=7 HEAD |
-        sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+	cd "${pkgname%-git}"
+	git describe --long --always --tags --abbrev=7 HEAD |
+		sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
-    cd "${pkgname%-git}"
+	cd "${pkgname%-git}"
+	# Upstream Issue: https://github.com/kivikakk/comrak/pull/193
 	cargo update
 	cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
 }
 
 build() {
-    cd "${pkgname%-git}"
+	cd "${pkgname%-git}"
+	export RUSTUP_TOOLCHAIN=stable
+	export CARGO_TARGET_DIR=target
 	cargo build --frozen --release --all-features
 }
 
 check() {
-    cd "${pkgname%-git}"
+	cd "${pkgname%-git}"
+	export RUSTUP_TOOLCHAIN=stable
 	cargo test --frozen --all-features
 }
 
 package () {
-    cd "${pkgname%-git}"
-    install -Dm755 -t "$pkgdir/usr/bin/" "target/release/${pkgname%-git}"
-    install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname/" COPYING
+	cd "${pkgname%-git}"
+	install -Dm0755 -t "$pkgdir/usr/bin/" "target/release/${pkgname%-git}"
+	install -Dm0644 -t "$pkgdir/usr/share/licenses/$pkgname/" COPYING
 }