summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Allen2016-09-26 08:40:25 -0700
committerSteven Allen2016-09-26 08:47:51 -0700
commitcc3c788926aa097fe6c0e2945039d0ae01fe0704 (patch)
tree96b537c52ac9be68689e8ef1ee28e889f2eba715
parent80e3371068985acbfa57aee5bf9d4500d60914de (diff)
downloadaur-cc3c788926aa097fe6c0e2945039d0ae01fe0704.tar.gz
conflict with rust-docs
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD4
2 files changed, 8 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 086d941a070..6b332e940ef 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Mon Sep 19 19:15:31 UTC 2016
+# Mon Sep 26 15:47:51 UTC 2016
pkgbase = rust-nightly-bin
pkgdesc = Fast, concurrent, safe. The Rust programming language and its package manager, Cargo.
- pkgver = 1.13.0_2016.09.18
+ pkgver = 1.13.0_2016.09.21
pkgrel = 1
url = https://www.rust-lang.org/
arch = i686
@@ -17,6 +17,7 @@ pkgbase = rust-nightly-bin
provides = rust-nightly
provides = cargo
provides = cargo-nightly
+ provides = rust-docs
conflicts = rust
conflicts = rust-git
conflicts = rust-nightly
@@ -25,10 +26,11 @@ pkgbase = rust-nightly-bin
conflicts = cargo-git
conflicts = cargo-nightly
conflicts = cargo-nightly-bin
+ conflicts = rust-docs
options = staticlibs
options = !strip
- source = rust-nightly-2016-09-19--unknown-linux-gnu.tar.gz.asc::https://static.rust-lang.org/dist/2016-09-19/rust-nightly--unknown-linux-gnu.tar.gz.asc
- source = rust-nightly-2016-09-19--unknown-linux-gnu.tar.gz::https://static.rust-lang.org/dist/2016-09-19/rust-nightly--unknown-linux-gnu.tar.gz
+ source = rust-nightly-2016-09-22--unknown-linux-gnu.tar.gz.asc::https://static.rust-lang.org/dist/2016-09-22/rust-nightly--unknown-linux-gnu.tar.gz.asc
+ source = rust-nightly-2016-09-22--unknown-linux-gnu.tar.gz::https://static.rust-lang.org/dist/2016-09-22/rust-nightly--unknown-linux-gnu.tar.gz
sha256sums = SKIP
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 9d0c05fe044..8b8dad0965a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,8 +10,8 @@ arch=('i686' 'x86_64')
pkgdesc='Fast, concurrent, safe. The Rust programming language and its package manager, Cargo.'
url='https://www.rust-lang.org/'
license=('MIT' 'Apache' 'custom')
-provides=('rust' 'rust-nightly' 'cargo' 'cargo-nightly')
-conflicts=('rust' 'rust-git' 'rust-nightly' 'cargo-nightly-bin' 'cargo' 'cargo-git' 'cargo-nightly' 'cargo-nightly-bin')
+provides=('rust' 'rust-nightly' 'cargo' 'cargo-nightly' 'rust-docs')
+conflicts=('rust' 'rust-git' 'rust-nightly' 'cargo-nightly-bin' 'cargo' 'cargo-git' 'cargo-nightly' 'cargo-nightly-bin' 'rust-docs')
depends=('gcc-libs' 'zlib' 'sh')
source=("rust-nightly-${_date}-${CARCH}-unknown-linux-gnu.tar.gz.asc::https://static.rust-lang.org/dist/${_date}/rust-nightly-${CARCH}-unknown-linux-gnu.tar.gz.asc"
"rust-nightly-${_date}-${CARCH}-unknown-linux-gnu.tar.gz::https://static.rust-lang.org/dist/${_date}/rust-nightly-${CARCH}-unknown-linux-gnu.tar.gz"