diff --git a/0001-Upgrade-crossbeam-utils-to-0.6.0.patch b/0001-Upgrade-crossbeam-utils-to-0.6.0.patch deleted file mode 100644 index d343134..0000000 --- a/0001-Upgrade-crossbeam-utils-to-0.6.0.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 5e71ad6c5b4b4f9d63400464d331c6d210ac8e70 Mon Sep 17 00:00:00 2001 -From: Alex Crichton -Date: Mon, 12 Nov 2018 08:04:28 -0800 -Subject: [PATCH] Upgrade crossbeam-utils to 0.6.0 - ---- - src/cargo/core/compiler/job_queue.rs | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/cargo/core/compiler/job_queue.rs b/src/cargo/core/compiler/job_queue.rs -index f97c7421..806412bc 100644 ---- a/src/cargo/core/compiler/job_queue.rs -+++ b/src/cargo/core/compiler/job_queue.rs -@@ -201,7 +201,9 @@ impl<'a> JobQueue<'a> { - srv.start(move |msg| drop(tx2.send(Message::FixDiagnostic(msg)))) - }); - -- crossbeam_utils::thread::scope(|scope| self.drain_the_queue(cx, plan, scope, &helper)) -+ crossbeam_utils::thread::scope(|scope| { -+ self.drain_the_queue(cx, plan, scope, &helper) -+ }).expect("child threads should't panic") - } - - fn drain_the_queue( -@@ -409,7 +411,7 @@ impl<'a> JobQueue<'a> { - match fresh { - Freshness::Fresh => doit(), - Freshness::Dirty => { -- scope.spawn(doit); -+ scope.spawn(move |_| doit()); - } - } - --- -2.20.0 - diff --git a/cargo-fix-metadata.diff b/cargo-fix-metadata.diff index 01bf626..ffa6b68 100644 --- a/cargo-fix-metadata.diff +++ b/cargo-fix-metadata.diff @@ -1,44 +1,50 @@ ---- cargo-0.32.0/Cargo.toml 1969-12-31T16:00:00-08:00 -+++ cargo-0.32.0/Cargo.toml 2019-04-02T16:59:42.426109-07:00 -@@ -41,7 +41,7 @@ - version = "0.20" - - [dependencies.crossbeam-utils] --version = "0.5" -+version = "0.6" - - [dependencies.crypto-hash] - version = "0.3.1" -@@ -69,10 +69,10 @@ +--- cargo-0.36.0/Cargo.toml 1970-01-01T00:00:00+00:00 ++++ cargo-0.36.0/Cargo.toml 2019-06-07T01:31:17.346606+00:00 +@@ -74,10 +74,10 @@ version = "0.4" [dependencies.git2] --version = "0.7.5" -+version = "0.8.0" +-version = "0.8.0" ++version = "0.9.0" [dependencies.git2-curl] --version = "0.8.1" -+version = "0.9.0" +-version = "0.9.0" ++version = "0.10.0" [dependencies.glob] - version = "0.2.11" -@@ -113,9 +113,6 @@ - [dependencies.openssl] - version = "0.10.11" + version = "0.3.0" +@@ -92,7 +92,7 @@ + version = "0.4" + + [dependencies.im-rc] +-version = "12.1.0" ++version = "13.0.0" + + [dependencies.jobserver] + version = "0.1.13" +@@ -107,7 +107,7 @@ + version = "0.2" + + [dependencies.libgit2-sys] +-version = "0.7.9" ++version = "0.8.0" + + [dependencies.log] + version = "0.4.6" +@@ -125,9 +125,6 @@ + [dependencies.pretty_env_logger] + version = "0.3" optional = true - -[dependencies.rustc-workspace-hack] -version = "1.0.0" [dependencies.rustfix] - version = "0.4.2" -@@ -166,18 +163,3 @@ - - [dev-dependencies.proptest] - version = "0.8.7" -- --[features] --vendored-openssl = ["openssl/vendored"] + version = "0.4.4" +@@ -187,15 +184,3 @@ + deny-warnings = [] + pretty-env-logger = ["pretty_env_logger"] + vendored-openssl = ["openssl/vendored"] -[target."cfg(target_os = \"macos\")".dependencies.core-foundation] -version = "0.6.0" -features = ["mac_os_10_7_support"] diff --git a/rust-cargo.spec b/rust-cargo.spec index 2aaff16..dfc979a 100644 --- a/rust-cargo.spec +++ b/rust-cargo.spec @@ -1,4 +1,4 @@ -# Generated by rust2rpm +# Generated by rust2rpm-9-1.fc30 # Tests are too much environment dependent %bcond_with check %global debug_package %{nil} @@ -9,8 +9,8 @@ %global crate cargo Name: rust-%{crate} -Version: 0.32.0 -Release: 4%{?dist} +Version: 0.36.0 +Release: 1%{?dist} Summary: Cargo, a package manager for Rust # Upstream license specification: MIT OR Apache-2.0 @@ -20,63 +20,65 @@ Source: %{crates_source} # Initial patched metadata # * No windows/macos # * No rustc-workspace-hack -# * Bump crossbeam-utils to 0.6, https://github.com/rust-lang/cargo/pull/6307 -# * Bump git2 to 0.8, https://github.com/rust-lang/cargo/pull/6438 -# * Bump git2-curl to 0.9, https://github.com/rust-lang/cargo/pull/6439 +# * Bump im-rc, https://github.com/rust-lang/cargo/pull/6959 +# * Bump git2, git2-curl, and libgit2-sys, https://github.com/rust-lang/cargo/pull/7018 Patch0: cargo-fix-metadata.diff -Patch1: 0001-Upgrade-crossbeam-utils-to-0.6.0.patch ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging BuildRequires: (crate(atty/default) >= 0.2.0 with crate(atty/default) < 0.3.0) +BuildRequires: (crate(byteorder/default) >= 1.2.0 with crate(byteorder/default) < 2.0.0) BuildRequires: (crate(bytesize/default) >= 1.0.0 with crate(bytesize/default) < 2.0.0) BuildRequires: (crate(clap/default) >= 2.31.2 with crate(clap/default) < 3.0.0) -BuildRequires: (crate(crates-io/default) >= 0.20.0 with crate(crates-io/default) < 0.21.0) +BuildRequires: (crate(crates-io/default) >= 0.24.0 with crate(crates-io/default) < 0.25.0) BuildRequires: (crate(crossbeam-utils/default) >= 0.6.0 with crate(crossbeam-utils/default) < 0.7.0) BuildRequires: (crate(crypto-hash/default) >= 0.3.1 with crate(crypto-hash/default) < 0.4.0) -BuildRequires: (crate(curl-sys/default) >= 0.4.12 with crate(curl-sys/default) < 0.5.0) -BuildRequires: (crate(curl/default) >= 0.4.17 with crate(curl/default) < 0.5.0) -BuildRequires: (crate(curl/http2) >= 0.4.17 with crate(curl/http2) < 0.5.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(curl-sys/default) >= 0.4.15 with crate(curl-sys/default) < 0.5.0) +BuildRequires: (crate(curl/default) >= 0.4.19 with crate(curl/default) < 0.5.0) +BuildRequires: (crate(curl/http2) >= 0.4.19 with crate(curl/http2) < 0.5.0) +BuildRequires: (crate(env_logger/default) >= 0.6.0 with crate(env_logger/default) < 0.7.0) +BuildRequires: (crate(failure/default) >= 0.1.5 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.3 with crate(flate2/default) < 2.0.0) +BuildRequires: (crate(flate2/zlib) >= 1.0.3 with crate(flate2/zlib) < 2.0.0) BuildRequires: (crate(fs2/default) >= 0.4.0 with crate(fs2/default) < 0.5.0) -BuildRequires: (crate(git2-curl/default) >= 0.9.0 with crate(git2-curl/default) < 0.10.0) -BuildRequires: (crate(git2/default) >= 0.8.0 with crate(git2/default) < 0.9.0) -BuildRequires: (crate(glob/default) >= 0.2.11 with crate(glob/default) < 0.3.0) +BuildRequires: (crate(git2-curl/default) >= 0.10.0 with crate(git2-curl/default) < 0.11.0) +BuildRequires: (crate(git2/default) >= 0.9.0 with crate(git2/default) < 0.10.0) +BuildRequires: (crate(glob/default) >= 0.3.0 with crate(glob/default) < 0.4.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) BuildRequires: (crate(ignore/default) >= 0.4.0 with crate(ignore/default) < 0.5.0) -BuildRequires: (crate(jobserver/default) >= 0.1.11 with crate(jobserver/default) < 0.2.0) -BuildRequires: (crate(lazy_static/default) >= 1.0.0 with crate(lazy_static/default) < 2.0.0) +BuildRequires: (crate(im-rc/default) >= 13.0.0 with crate(im-rc/default) < 14.0.0) +BuildRequires: (crate(jobserver/default) >= 0.1.13 with crate(jobserver/default) < 0.2.0) +BuildRequires: (crate(lazy_static/default) >= 1.2.0 with crate(lazy_static/default) < 2.0.0) BuildRequires: (crate(lazycell/default) >= 1.2.0 with crate(lazycell/default) < 2.0.0) BuildRequires: (crate(libc/default) >= 0.2.0 with crate(libc/default) < 0.3.0) -BuildRequires: (crate(libgit2-sys/default) >= 0.7.9 with crate(libgit2-sys/default) < 0.8.0) -BuildRequires: (crate(log/default) >= 0.4.0 with crate(log/default) < 0.5.0) +BuildRequires: (crate(libgit2-sys/default) >= 0.8.0 with crate(libgit2-sys/default) < 0.9.0) +BuildRequires: (crate(log/default) >= 0.4.6 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(rustfix/default) >= 0.4.4 with crate(rustfix/default) < 0.5.0) BuildRequires: (crate(same-file/default) >= 1.0.0 with crate(same-file/default) < 2.0.0) BuildRequires: (crate(semver/default) >= 0.9.0 with crate(semver/default) < 0.10.0) 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/default) >= 1.0.82 with crate(serde/default) < 2.0.0) +BuildRequires: (crate(serde/derive) >= 1.0.82 with crate(serde/derive) < 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.30 with crate(serde_json/default) < 2.0.0) BuildRequires: (crate(serde_json/raw_value) >= 1.0.30 with crate(serde_json/raw_value) < 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(tar) >= 0.4.18 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) -BuildRequires: (crate(toml/default) >= 0.4.2 with crate(toml/default) < 0.5.0) +BuildRequires: (crate(toml/default) >= 0.5.0 with crate(toml/default) < 0.6.0) BuildRequires: (crate(unicode-width/default) >= 0.1.5 with crate(unicode-width/default) < 0.2.0) BuildRequires: (crate(url/default) >= 1.1.0 with crate(url/default) < 2.0.0) +BuildRequires: (crate(url_serde/default) >= 0.2.0 with crate(url_serde/default) < 0.3.0) +BuildRequires: (crate(walkdir/default) >= 2.2.0 with crate(walkdir/default) < 3.0.0) %if %{with check} BuildRequires: (crate(bufstream/default) >= 0.1.0 with crate(bufstream/default) < 0.2.0) -BuildRequires: (crate(proptest/default) >= 0.8.7 with crate(proptest/default) < 0.9.0) +BuildRequires: (crate(proptest/default) >= 0.9.1 with crate(proptest/default) < 0.10.0) BuildRequires: git-core %endif @@ -112,6 +114,18 @@ which use "default" feature of "%{crate}" crate. %files -n %{name}+default-devel %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%package -n %{name}+deny-warnings-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+deny-warnings-devel %{_description} + +This package contains library source intended for building other packages +which use "deny-warnings" feature of "%{crate}" crate. + +%files -n %{name}+deny-warnings-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + %package -n %{name}+openssl-devel Summary: %{summary} BuildArch: noarch @@ -124,6 +138,30 @@ which use "openssl" feature of "%{crate}" crate. %files -n %{name}+openssl-devel %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%package -n %{name}+pretty-env-logger-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+pretty-env-logger-devel %{_description} + +This package contains library source intended for building other packages +which use "pretty-env-logger" feature of "%{crate}" crate. + +%files -n %{name}+pretty-env-logger-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+pretty_env_logger-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+pretty_env_logger-devel %{_description} + +This package contains library source intended for building other packages +which use "pretty_env_logger" feature of "%{crate}" crate. + +%files -n %{name}+pretty_env_logger-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 %cargo_prep @@ -140,6 +178,9 @@ which use "openssl" feature of "%{crate}" crate. %endif %changelog +* Fri Jun 07 2019 Josh Stone - 0.36.0-1 +- Update to 0.36.0 + * Wed Apr 03 2019 Josh Stone - 0.32.0-4 - Bump git2 and git2-curl dependencies