From aef0c99ea9251adb593d8442743b33e76aef2ba3 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 5 Oct 2022 13:53:04 +0200 Subject: [PATCH] Update to version 0.11.12; Fixes RHBZ#2128505 --- .gitignore | 1 + ...ata.diff => reqwest-fix-metadata-auto.diff | 27 +++++++++---------- rust-reqwest.spec | 14 +++++----- .rust2rpm.conf => rust2rpm.conf | 0 sources | 2 +- 5 files changed, 21 insertions(+), 23 deletions(-) rename reqwest-fix-metadata.diff => reqwest-fix-metadata-auto.diff (71%) rename .rust2rpm.conf => rust2rpm.conf (100%) diff --git a/.gitignore b/.gitignore index 725adee..6bae3dc 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /reqwest-0.11.6.crate /reqwest-0.11.10.crate /reqwest-0.11.11.crate +/reqwest-0.11.12.crate diff --git a/reqwest-fix-metadata.diff b/reqwest-fix-metadata-auto.diff similarity index 71% rename from reqwest-fix-metadata.diff rename to reqwest-fix-metadata-auto.diff index bbefcdb..791dbbf 100644 --- a/reqwest-fix-metadata.diff +++ b/reqwest-fix-metadata-auto.diff @@ -1,19 +1,18 @@ ---- reqwest-0.11.11/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ reqwest-0.11.11/Cargo.toml 2022-07-17T13:09:58.129385+00:00 -@@ -208,7 +208,7 @@ - trust-dns = ["trust-dns-resolver"] - - [target."cfg(not(target_arch = \"wasm32\"))".dependencies.async-compression] --version = "0.3.13" -+version = "0.3.12" - features = ["tokio"] - optional = true - default-features = false -@@ -373,42 +373,3 @@ - "rt-multi-thread", +--- reqwest-0.11.12/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ reqwest-0.11.12/Cargo.toml 1970-01-01T00:00:01+00:00 +@@ -179,7 +179,7 @@ + "async-compression/gzip", + "tokio-util", + ] +-json = ["serde_json"] ++json = [] + multipart = ["mime_guess"] + native-tls = ["default-tls"] + native-tls-alpn = [ +@@ -374,41 +374,3 @@ ] default-features = false -- + -[target."cfg(target_arch = \"wasm32\")".dependencies.js-sys] -version = "0.3.45" - diff --git a/rust-reqwest.spec b/rust-reqwest.spec index 9c25fbe..78afbf9 100644 --- a/rust-reqwest.spec +++ b/rust-reqwest.spec @@ -1,22 +1,20 @@ -# Generated by rust2rpm 21 +# Generated by rust2rpm 22 %bcond_without check %global debug_package %{nil} %global crate reqwest -Name: rust-%{crate} -Version: 0.11.11 +Name: rust-reqwest +Version: 0.11.12 Release: %autorelease Summary: Higher level HTTP client library # Upstream license specification: MIT/Apache-2.0 -License: MIT or ASL 2.0 +License: MIT OR Apache-2.0 URL: https://crates.io/crates/reqwest Source: %{crates_source} -# Initial patched metadata -# * drop windows- and WASM-specific dependencies -# * temporarily downgrade async-compression from 0.3.13 to 0.3.12 -Patch0: reqwest-fix-metadata.diff +# Automatically generated patch to strip foreign dependencies +Patch: reqwest-fix-metadata-auto.diff ExclusiveArch: %{rust_arches} diff --git a/.rust2rpm.conf b/rust2rpm.conf similarity index 100% rename from .rust2rpm.conf rename to rust2rpm.conf diff --git a/sources b/sources index ad00ed3..f54ea98 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (reqwest-0.11.11.crate) = 62b59d6114b6aa1c2fc936940e940ce9f66416024ea046970deb30dbf5f261edd5b073b3890b6ef11edc41b4e414429eaea391ff1dddffafe178d71605a7f447 +SHA512 (reqwest-0.11.12.crate) = 7ce5e08b580beb3f514c913e3f931242cb6be27a3520285003d054e6ca2efd31eeb469aecd049569e46b7e12c6ee884f5cbcd9665c1e868a83d9bfa4c77e5d03