From c56bdf22046d1dfef3ded92cdca5397e5e8ca50a Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 28 Apr 2024 10:30:58 -0400 Subject: [PATCH] Drop unused sync_wrapper dependency This helps clear the way for updating rust-sync_wrapper to 1.0.1. --- reqwest-fix-metadata-auto.diff | 2 +- reqwest-fix-metadata.diff | 16 +++++++++++++--- rust-reqwest.spec | 2 ++ rust2rpm.toml | 7 ++++++- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/reqwest-fix-metadata-auto.diff b/reqwest-fix-metadata-auto.diff index 233028d..d1c3011 100644 --- a/reqwest-fix-metadata-auto.diff +++ b/reqwest-fix-metadata-auto.diff @@ -1,5 +1,5 @@ --- reqwest-0.12.4/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ reqwest-0.12.4/Cargo.toml 2024-04-19T22:19:11.305463+00:00 ++++ reqwest-0.12.4/Cargo.toml 2024-04-28T14:30:10.095647+00:00 @@ -228,7 +228,7 @@ "hyper-util/http2", ] diff --git a/reqwest-fix-metadata.diff b/reqwest-fix-metadata.diff index ca53f75..6ee2e89 100644 --- a/reqwest-fix-metadata.diff +++ b/reqwest-fix-metadata.diff @@ -1,6 +1,16 @@ --- reqwest-0.12.4/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ reqwest-0.12.4/Cargo.toml 2024-04-19T22:19:30.447563+00:00 -@@ -203,7 +203,6 @@ ++++ reqwest-0.12.4/Cargo.toml 2024-04-28T14:30:24.227834+00:00 +@@ -159,9 +159,6 @@ + [dependencies.serde_urlencoded] + version = "0.7.1" + +-[dependencies.sync_wrapper] +-version = "0.1.2" +- + [dependencies.tower-service] + version = "0.3" + +@@ -203,7 +200,6 @@ "default-tls", "charset", "http2", @@ -8,7 +18,7 @@ ] default-tls = [ "dep:hyper-tls", -@@ -228,7 +227,6 @@ +@@ -228,7 +224,6 @@ "hyper-util/http2", ] json = ["dep:serde_json"] diff --git a/rust-reqwest.spec b/rust-reqwest.spec index 701dfe9..2a08764 100644 --- a/rust-reqwest.spec +++ b/rust-reqwest.spec @@ -16,6 +16,8 @@ Source: %{crates_source} Patch: reqwest-fix-metadata-auto.diff # Manually created patch for downstream crate metadata changes # * drop macOS-specific features +# * drop unused sync_wrapper dependency; see +# https://github.com/seanmonstar/reqwest/pull/2229 Patch: reqwest-fix-metadata.diff BuildRequires: cargo-rpm-macros >= 24 diff --git a/rust2rpm.toml b/rust2rpm.toml index 924dd67..534c532 100644 --- a/rust2rpm.toml +++ b/rust2rpm.toml @@ -1,3 +1,9 @@ +[package] +cargo-toml-patch-comments = [ + "drop macOS-specific features", + "drop unused sync_wrapper dependency; see https://github.com/seanmonstar/reqwest/pull/2229", +] + [features] hide = [ "h3", @@ -15,4 +21,3 @@ skip = [ ] skip-exact = true comments = ["skip tests which require internet access"] -