From 736781cce8e451dabfa5cf5a2d5cbc2c977fee00 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Nov 17 2018 10:43:09 +0000 Subject: Update to 0.31.0 Signed-off-by: Igor Gnatenko --- diff --git a/.gitignore b/.gitignore index ed2e136..55d6444 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /cargo-0.28.0.crate /cargo-0.29.0.crate /cargo-0.30.0.crate +/cargo-0.31.0.crate diff --git a/cargo-fix-metadata.diff b/cargo-fix-metadata.diff index d845317..68a1782 100644 --- a/cargo-fix-metadata.diff +++ b/cargo-fix-metadata.diff @@ -1,6 +1,6 @@ ---- cargo-0.30.0/Cargo.toml 1970-01-01T01:00:00+01:00 -+++ cargo-0.30.0/Cargo.toml 2018-10-21T09:56:48.085307+02:00 -@@ -104,9 +104,6 @@ +--- cargo-0.31.0/Cargo.toml 1970-01-01T01:00:00+01:00 ++++ cargo-0.31.0/Cargo.toml 2018-11-17T11:40:19.103573+01:00 +@@ -107,9 +107,6 @@ version = "0.10.11" optional = true @@ -10,7 +10,7 @@ [dependencies.rustfix] version = "0.4.2" -@@ -152,15 +149,3 @@ +@@ -155,18 +152,3 @@ version = "1.1" [dev-dependencies.bufstream] version = "0.1" @@ -20,6 +20,9 @@ -[target."cfg(target_os = \"macos\")".dependencies.core-foundation] -version = "0.6.0" -features = ["mac_os_10_7_support"] +-[target."cfg(windows)".dependencies.fwdansi] +-version = "1" +- -[target."cfg(windows)".dependencies.miow] -version = "0.3.1" - diff --git a/rust-cargo.spec b/rust-cargo.spec index eb6f8a4..a3fa9fb 100644 --- a/rust-cargo.spec +++ b/rust-cargo.spec @@ -3,11 +3,14 @@ %bcond_with check %global debug_package %{nil} +# We ship it as part of rust.src +%global __cargo_is_bin() false + %global crate cargo Name: rust-%{crate} -Version: 0.30.0 -Release: 2%{?dist} +Version: 0.31.0 +Release: 1%{?dist} Summary: Cargo, a package manager for Rust # Upstream license specification: MIT OR Apache-2.0 @@ -24,17 +27,17 @@ ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging BuildRequires: (crate(atty/default) >= 0.2.0 with crate(atty/default) < 0.3.0) BuildRequires: (crate(clap/default) >= 2.31.2 with crate(clap/default) < 3.0.0) -BuildRequires: (crate(crates-io/default) >= 0.18.0 with crate(crates-io/default) < 0.19.0) +BuildRequires: (crate(crates-io/default) >= 0.19.0 with crate(crates-io/default) < 0.20.0) BuildRequires: (crate(crossbeam-utils/default) >= 0.5.0 with crate(crossbeam-utils/default) < 0.6.0) BuildRequires: (crate(crypto-hash/default) >= 0.3.1 with crate(crypto-hash/default) < 0.4.0) BuildRequires: (crate(curl/default) >= 0.4.13 with crate(curl/default) < 0.5.0) -BuildRequires: (crate(env_logger/default) >= 0.5.4 with crate(env_logger/default) < 0.6.0) +BuildRequires: (crate(env_logger/default) >= 0.5.11 with crate(env_logger/default) < 0.6.0) BuildRequires: (crate(failure/default) >= 0.1.2 with crate(failure/default) < 0.2.0) BuildRequires: (crate(filetime/default) >= 0.2.0 with crate(filetime/default) < 0.3.0) BuildRequires: (crate(flate2/default) >= 1.0.0 with crate(flate2/default) < 2.0.0) BuildRequires: (crate(fs2/default) >= 0.4.0 with crate(fs2/default) < 0.5.0) BuildRequires: (crate(git2-curl/default) >= 0.8.1 with crate(git2-curl/default) < 0.9.0) -BuildRequires: (crate(git2/default) >= 0.7.3 with crate(git2/default) < 0.8.0) +BuildRequires: (crate(git2/default) >= 0.7.5 with crate(git2/default) < 0.8.0) BuildRequires: (crate(glob/default) >= 0.2.11 with crate(glob/default) < 0.3.0) BuildRequires: (crate(hex/default) >= 0.3.0 with crate(hex/default) < 0.4.0) BuildRequires: (crate(home/default) >= 0.3.0 with crate(home/default) < 0.4.0) @@ -46,6 +49,7 @@ BuildRequires: (crate(libc/default) >= 0.2.0 with crate(libc/default) < 0.3.0) BuildRequires: (crate(libgit2-sys/default) >= 0.7.5 with crate(libgit2-sys/default) < 0.8.0) BuildRequires: (crate(log/default) >= 0.4.0 with crate(log/default) < 0.5.0) BuildRequires: (crate(num_cpus/default) >= 1.0.0 with crate(num_cpus/default) < 2.0.0) +BuildRequires: (crate(opener/default) >= 0.3.0 with crate(opener/default) < 0.4.0) BuildRequires: (crate(openssl/default) >= 0.10.11 with crate(openssl/default) < 0.11.0) BuildRequires: (crate(rustfix/default) >= 0.4.2 with crate(rustfix/default) < 0.5.0) BuildRequires: (crate(same-file/default) >= 1.0.0 with crate(same-file/default) < 2.0.0) @@ -54,8 +58,8 @@ BuildRequires: (crate(semver/serde) >= 0.9.0 with crate(semver/serde) < 0.10.0) BuildRequires: (crate(serde/default) >= 1.0.0 with crate(serde/default) < 2.0.0) BuildRequires: (crate(serde_derive/default) >= 1.0.0 with crate(serde_derive/default) < 2.0.0) BuildRequires: (crate(serde_ignored/default) >= 0.0.4 with crate(serde_ignored/default) < 0.0.5) -BuildRequires: (crate(serde_json/default) >= 1.0.0 with crate(serde_json/default) < 2.0.0) -BuildRequires: (crate(shell-escape/default) >= 0.1.0 with crate(shell-escape/default) < 0.2.0) +BuildRequires: (crate(serde_json/default) >= 1.0.24 with crate(serde_json/default) < 2.0.0) +BuildRequires: (crate(shell-escape/default) >= 0.1.4 with crate(shell-escape/default) < 0.2.0) BuildRequires: (crate(tar) >= 0.4.15 with crate(tar) < 0.5.0) BuildRequires: (crate(tempfile/default) >= 3.0.0 with crate(tempfile/default) < 4.0.0) BuildRequires: (crate(termcolor/default) >= 1.0.0 with crate(termcolor/default) < 2.0.0) @@ -86,8 +90,6 @@ which use "%{crate}" crate. %doc ARCHITECTURE.md CONTRIBUTING.md README.md src/doc %{cargo_registry}/%{crate}-%{version}/ %exclude %{cargo_registry}/%{crate}-%{version}/{appveyor.yml,etc} -# We ship it as part of rust.src -%exclude %{_bindir}/cargo %package -n %{name}+default-devel Summary: %{summary} @@ -129,6 +131,9 @@ which use "openssl" feature of "%{crate}" crate. %endif %changelog +* Sat Nov 17 2018 Igor Gnatenko - 0.31.0-1 +- Update to 0.31.0 + * Tue Nov 13 2018 Josh Stone - 0.30.0-2 - Adapt to new packaging diff --git a/sources b/sources index 9b5750f..dc862d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cargo-0.30.0.crate) = 7d6f99710fa7a68de0a36c7f79fee5c1281f626822faa193f2e9c777dafb992cd62dfaa02fab0f274837dd13849b1725a9d8b1f18729062d33cd01f5ffb845af +SHA512 (cargo-0.31.0.crate) = b9d64a8d1d92800b44789f927df5eab55cc4ffc377b874f1c076ee7f1a7f89f5e1a98127b55f9ccd4d378cc2c20e441f1986f22d0c3bde088f1ec1a5a0315b60