From cd3e2588b580a2f046130d3a2f866eae431f843d Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 15 Sep 2024 11:50:22 -0400 Subject: [PATCH] Use the current major version of async-channel https://github.com/async-rs/async-std/pull/1092 --- async-std-fix-metadata-auto.diff | 2 +- async-std-fix-metadata.diff | 11 ++++++++++- rust-async-std.spec | 2 ++ rust2rpm.toml | 1 + 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/async-std-fix-metadata-auto.diff b/async-std-fix-metadata-auto.diff index dd1109e..f560665 100644 --- a/async-std-fix-metadata-auto.diff +++ b/async-std-fix-metadata-auto.diff @@ -1,5 +1,5 @@ --- async-std-1.13.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ async-std-1.13.0/Cargo.toml 2024-09-15T04:52:07.805601+00:00 ++++ async-std-1.13.0/Cargo.toml 2024-09-15T15:47:53.182471+00:00 @@ -291,7 +291,6 @@ "kv-log-macro", "log", diff --git a/async-std-fix-metadata.diff b/async-std-fix-metadata.diff index 805d1e1..b261043 100644 --- a/async-std-fix-metadata.diff +++ b/async-std-fix-metadata.diff @@ -1,5 +1,5 @@ --- async-std-1.13.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ async-std-1.13.0/Cargo.toml 2024-09-15T04:53:00.578316+00:00 ++++ async-std-1.13.0/Cargo.toml 2024-09-15T15:49:39.901950+00:00 @@ -70,10 +70,6 @@ path = "examples/list-dir.rs" @@ -23,6 +23,15 @@ [[example]] name = "task-local" +@@ -209,7 +200,7 @@ + optional = true + + [dependencies.async-channel] +-version = "1.8.0" ++version = "2.2.0" + optional = true + + [dependencies.async-lock] @@ -229,13 +220,8 @@ version = "0.3.4" optional = true diff --git a/rust-async-std.spec b/rust-async-std.spec index 93d4180..8331fb1 100644 --- a/rust-async-std.spec +++ b/rust-async-std.spec @@ -18,6 +18,8 @@ Patch: async-std-fix-metadata-auto.diff # * drop tokio v0.2 and v0.3 features # * drop optional surf dependency # * drop additional dependencies for tracing-level log statements +# * Use the current major version of async-channel +# (https://github.com/async-rs/async-std/pull/1092) Patch: async-std-fix-metadata.diff # * fix building tests with Rust 1.78+ Patch: 0001-drop-deny-warnings-from-doctests.patch diff --git a/rust2rpm.toml b/rust2rpm.toml index 1043e23..662a696 100644 --- a/rust2rpm.toml +++ b/rust2rpm.toml @@ -3,6 +3,7 @@ cargo-toml-patch-comments = [ "drop tokio v0.2 and v0.3 features", "drop optional surf dependency", "drop additional dependencies for tracing-level log statements", + "Use the current major version of async-channel (https://github.com/async-rs/async-std/pull/1092)", ] [scripts]