Date: Sunday, July 31, 2016 @ 23:32:01 Author: arodseth Revision: 184727
FS#48606 Modified: cargo/trunk/PKGBUILD ----------+ PKGBUILD | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-07-31 22:10:15 UTC (rev 184726) +++ PKGBUILD 2016-07-31 23:32:01 UTC (rev 184727) @@ -4,22 +4,21 @@ pkgname=cargo pkgver=0.11.0 -pkgrel=1 +pkgrel=2 pkgdesc='Rust package manager' url='http://crates.io/' arch=('x86_64' 'i686') license=('APACHE' 'MIT' 'custom') -depends=('curl' 'rust' 'clang') -makedepends=('cmake' 'git' 'python') +depends=('curl' 'rust') +makedepends=('git' 'python' 'cmake') options=('!emptydirs') source=("git+https://github.com/rust-lang/cargo.git#tag=$pkgver") md5sums=('SKIP') prepare() { - cd "$pkgname" - - git submodule init - git submodule update + for cmd in init update; do (cd "$pkgname"; git submodule "$cmd"); done + sed 's^share/doc^share/licenses^g' -i "$pkgname/Makefile.in" + sed 's^bash_completion.d/^bash-completion/completions/^g' -i "$pkgname/Makefile.in" } build() { @@ -34,20 +33,13 @@ make DESTDIR="$pkgdir" install - # Contains reference to $srcdir and $pkgdir - find "$pkgdir" -name install.log -delete - find "$pkgdir" -name manifest-cargo -delete - - # Conflicts with the rust package - find "$pkgdir" -name uninstall.sh -delete - - install -d "$pkgdir/usr/share/bash-completion/completions" - mv "$pkgdir/usr/etc/bash_completion.d/cargo" \ - "$pkgdir/usr/share/bash-completion/completions/cargo" - - install -d "$pkgdir/usr/share/licenses/$pkgname" - mv "$pkgdir/usr/share/doc/cargo/LICENSE"* \ - "$pkgdir/usr/share/licenses/$pkgname" + # Remove files that contains references to $srcdir or $pkgdir, + # or that conflicts with the rust package. + find "$pkgdir" \ + -name install.log \ + -o -name manifest-cargo \ + -o -name uninstall.sh \ + -delete } # vim:set ts=2 sw=2 et: