[arch-commits] Commit in cargo/trunk (PKGBUILD)

[Johannes Löthberg]

    Date: Saturday, March 4, 2017 @ 17:55:52
  Author: demize
Revision: 214909

OpenSSL 1.1.0 rebuild

Modified:
  cargo/trunk/PKGBUILD

----------+
 PKGBUILD |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-04 16:19:54 UTC (rev 214908)
+++ PKGBUILD	2017-03-04 17:55:52 UTC (rev 214909)
@@ -4,28 +4,30 @@
 
 pkgname=cargo
 pkgver=0.16.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Rust package manager'
 url='http://crates.io/'
 arch=('x86_64' 'i686')
 license=('APACHE' 'MIT' 'custom')
 depends=('curl' 'rust')
-makedepends=('git' 'setconf' 'python' 'cmake' 'cargo')
+makedepends=('git' 'python' 'cmake' 'cargo')
 optdepends=('gcc: for compiling C source code with gcc'
             'clang: for compiling C source code with clang')
 groups=('rust')
 options=('!emptydirs')
-source=("git+https://github.com/rust-lang/cargo.git#tag=$pkgver")
-md5sums=('SKIP')
+source=("git+https://github.com/rust-lang/cargo.git#tag=$pkgver"
+        "git+https://github.com/rust-lang/rust-installer.git")
+md5sums=('SKIP'
+         'SKIP')
 
 prepare() {
   cd cargo
 
-  git submodule update --init --recursive
+  git submodule init
+  git config submodule.src/rust-installer.url "$srcdir"/rust-installer
+  git submodule update
+
   sed 's^share/doc^share/licenses^g' -i Makefile.in
-
-  # Upstream forgot to bump the version number, FS#51939
-  setconf Makefile.in CFG_RELEASE_NUM="$pkgver"
 }
 
 build() {