upgpkg: mdbook-git 0.4.12.r0.ge6629cd7-2

move 'cargo fetch' to 'prepare()'

2 files changed, 28 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 99053afb0726..f2fef34ba8c4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mdbook-git
 	pkgdesc = Create book from markdown files, like Gitbook but implemented in Rust
 	pkgver = 0.4.12.r0.ge6629cd7
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/rust-lang-nursery/mdBook
 	arch = x86_64
 	arch = i686
@@ -10,8 +10,9 @@ pkgbase = mdbook-git
 	arch = armv7h
 	arch = aarch64
 	license = MPL2
-	makedepends = rust
+	makedepends = cargo
 	makedepends = git
+	depends = gcc-libs
 	provides = mdbook
 	conflicts = mdbook
 	source = git+https://github.com/rust-lang-nursery/mdBook.git
diff --git a/PKGBUILD b/PKGBUILD
index d5b2bdfd9e6b..19a856ef5d2c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,42 +3,50 @@
 
 pkgname=mdbook-git
 pkgver=0.4.12.r0.ge6629cd7
-pkgrel=1
+pkgrel=2
 pkgdesc="Create book from markdown files, like Gitbook but implemented in Rust"
 url="https://github.com/rust-lang-nursery/mdBook"
-arch=(x86_64 i686 arm armv6h armv7h aarch64)
-license=(MPL2)
-makedepends=(rust git)
-provides=(mdbook)
-conflicts=(mdbook)
+arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
+license=('MPL2')
+depends=('gcc-libs')
+makedepends=('cargo' 'git')
+provides=('mdbook')
+conflicts=('mdbook')
 source=("git+${url}.git")
 md5sums=('SKIP')
 
 pkgver() {
-    cd "mdBook"
+    cd mdBook
     git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
+    cd mdBook
     mkdir -p completions/
     cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
 }
 
 build() {
     cd mdBook
+    export RUSTUP_TOOLCHAIN=stable
+    export CARGO_TARGET_DIR=target
     cargo build --frozen --release
-    cargo run -- completions bash > "completions/mdbook.bash"
-    cargo run -- completions fish > "completions/mdbook.fish"
-    cargo run -- completions zsh > "completions/_mdbook"
+    ./target/release/mdbook completions bash > completions/mdbook.bash
+    ./target/release/mdbook completions fish > completions/mdbook.fish
+    ./target/release/mdbook completions zsh > completions/_mdbook
 }
 
 check() {
-    cd "mdBook"
+    cd mdBook
+    export RUSTUP_TOOLCHAIN=stable
     cargo test --frozen
 }
 
 package() {
-    cd "mdBook"
-    install -Dm 755 "target/release/mdbook" -t "$pkgdir/usr/bin"
-    install -Dm 644 README.md -t "$pkgdir/usr/share/doc/mdbook"
-    install -Dm 644 "completions/mdbook.bash" "$pkgdir/usr/share/bash-completion/completions/mdbook"
-    install -Dm 644 "completions/mdbook.fish" -t "$pkgdir/usr/share/fish/vendor_completions.d"
-    install -Dm 644 "completions/_mdbook" -t "$pkgdir/usr/share/zsh/site-functions"
+    cd mdBook
+    install -Dm755 target/release/mdbook -t "$pkgdir/usr/bin"
+    install -Dm644 README.md -t "$pkgdir/usr/share/doc/mdbook"
+    install -Dm644 completions/mdbook.bash "$pkgdir/usr/share/bash-completion/completions/mdbook"
+    install -Dm644 completions/mdbook.fish -t "$pkgdir/usr/share/fish/vendor_completions.d"
+    install -Dm644 completions/_mdbook -t "$pkgdir/usr/share/zsh/site-functions"
 }