From 241c7d657b901346810384226fc7512c7a28c4da Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Sat, 4 Jan 2025 22:58:01 +0300 Subject: [PATCH] import rust-reqwest-0.12.12-1.el10 --- .gitignore | 2 +- .rust-reqwest.metadata | 2 +- SOURCES/reqwest-fix-metadata-auto.diff | 10 ++-- SOURCES/reqwest-fix-metadata.diff | 72 +++++++++++++------------- SPECS/rust-reqwest.spec | 22 +++++--- 5 files changed, 57 insertions(+), 51 deletions(-) diff --git a/.gitignore b/.gitignore index b6b57c0..704bd66 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/reqwest-0.12.9.crate +SOURCES/reqwest-0.12.12.crate diff --git a/.rust-reqwest.metadata b/.rust-reqwest.metadata index 8f790a9..3a21fd0 100644 --- a/.rust-reqwest.metadata +++ b/.rust-reqwest.metadata @@ -1 +1 @@ -8d489379ab7c0e9b3348279a8a87522c78212604 SOURCES/reqwest-0.12.9.crate +ba5ff9f835792d423c27feb2ea4a5955645f2284 SOURCES/reqwest-0.12.12.crate diff --git a/SOURCES/reqwest-fix-metadata-auto.diff b/SOURCES/reqwest-fix-metadata-auto.diff index 0e7812b..b73ac4a 100644 --- a/SOURCES/reqwest-fix-metadata-auto.diff +++ b/SOURCES/reqwest-fix-metadata-auto.diff @@ -1,6 +1,6 @@ ---- reqwest-0.12.9/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ reqwest-0.12.9/Cargo.toml 2024-10-30T22:19:12.691722+00:00 -@@ -285,7 +285,7 @@ +--- reqwest-0.12.12/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ reqwest-0.12.12/Cargo.toml 2025-01-04T14:02:28.391991+00:00 +@@ -132,7 +132,7 @@ "dep:futures-channel", ] json = ["dep:serde_json"] @@ -9,7 +9,7 @@ multipart = ["dep:mime_guess"] native-tls = ["default-tls"] native-tls-alpn = [ -@@ -326,7 +326,6 @@ +@@ -173,7 +173,6 @@ stream = [ "tokio/fs", "dep:tokio-util", @@ -17,7 +17,7 @@ ] trust-dns = [] zstd = [ -@@ -566,57 +565,8 @@ +@@ -593,57 +592,8 @@ version = "0.13" package = "zstd" diff --git a/SOURCES/reqwest-fix-metadata.diff b/SOURCES/reqwest-fix-metadata.diff index 7673082..abfc5ba 100644 --- a/SOURCES/reqwest-fix-metadata.diff +++ b/SOURCES/reqwest-fix-metadata.diff @@ -1,32 +1,6 @@ ---- reqwest-0.12.9/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ reqwest-0.12.9/Cargo.toml 2024-10-30T22:21:02.376394+00:00 -@@ -71,10 +71,6 @@ - path = "examples/form.rs" - - [[example]] --name = "h3_simple" --path = "examples/h3_simple.rs" -- --[[example]] - name = "json_dynamic" - path = "examples/json_dynamic.rs" - required-features = ["json"] -@@ -101,14 +97,6 @@ - name = "blocking" - path = "tests/blocking.rs" - required-features = ["blocking"] -- --[[test]] --name = "brotli" --path = "tests/brotli.rs" --required-features = [ -- "brotli", -- "stream", --] - - [[test]] - name = "client" -@@ -224,7 +212,6 @@ +--- reqwest-0.12.12/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ reqwest-0.12.12/Cargo.toml 2025-01-04T14:04:13.275543+00:00 +@@ -71,7 +71,6 @@ "hyper-rustls?/ring", "tokio-rustls?/ring", "rustls?/ring", @@ -34,7 +8,7 @@ ] __tls = [ "dep:rustls-pemfile", -@@ -237,11 +224,6 @@ +@@ -84,11 +83,6 @@ "futures-util/sink", "tokio/sync", ] @@ -46,7 +20,7 @@ charset = ["dep:encoding_rs"] cookies = [ "dep:cookie_crate", -@@ -251,7 +233,6 @@ +@@ -98,7 +92,6 @@ "default-tls", "charset", "http2", @@ -54,7 +28,7 @@ ] default-tls = [ "dep:hyper-tls", -@@ -276,16 +257,7 @@ +@@ -123,16 +116,7 @@ "hyper-util/http2", "hyper-rustls?/http2", ] @@ -71,7 +45,7 @@ multipart = ["dep:mime_guess"] native-tls = ["default-tls"] native-tls-alpn = [ -@@ -293,10 +265,6 @@ +@@ -140,10 +124,6 @@ "native-tls-crate?/alpn", "hyper-tls?/alpn", ] @@ -82,7 +56,33 @@ rustls-tls = ["rustls-tls-webpki-roots"] rustls-tls-manual-roots = [ "rustls-tls-manual-roots-no-provider", -@@ -361,14 +329,6 @@ +@@ -199,10 +179,6 @@ + path = "examples/form.rs" + + [[example]] +-name = "h3_simple" +-path = "examples/h3_simple.rs" +- +-[[example]] + name = "json_dynamic" + path = "examples/json_dynamic.rs" + required-features = ["json"] +@@ -229,14 +205,6 @@ + name = "blocking" + path = "tests/blocking.rs" + required-features = ["blocking"] +- +-[[test]] +-name = "brotli" +-path = "tests/brotli.rs" +-required-features = [ +- "brotli", +- "stream", +-] + + [[test]] + name = "client" +@@ -380,14 +348,6 @@ version = "0.4" optional = true @@ -97,7 +97,7 @@ [target.'cfg(not(target_arch = "wasm32"))'.dependencies.hickory-resolver] version = "0.24" features = ["tokio-runtime"] -@@ -432,15 +392,6 @@ +@@ -451,15 +411,6 @@ [target.'cfg(not(target_arch = "wasm32"))'.dependencies.pin-project-lite] version = "0.2.11" @@ -113,7 +113,7 @@ [target.'cfg(not(target_arch = "wasm32"))'.dependencies.rustls] version = "0.23.4" features = [ -@@ -501,10 +452,6 @@ +@@ -528,10 +479,6 @@ [target.'cfg(not(target_arch = "wasm32"))'.dependencies.webpki-roots] version = "0.26.0" optional = true diff --git a/SPECS/rust-reqwest.spec b/SPECS/rust-reqwest.spec index e9cb74b..b2a1a99 100644 --- a/SPECS/rust-reqwest.spec +++ b/SPECS/rust-reqwest.spec @@ -2,20 +2,20 @@ ## (rpmautospec version 0.7.3) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 2; + release_number = 1; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} ## END: Set by rpmautospec -# Generated by rust2rpm 26 -%bcond_without check +# Generated by rust2rpm 27 +%bcond check 1 %global debug_package %{nil} %global crate reqwest Name: rust-reqwest -Version: 0.12.9 +Version: 0.12.12 Release: %autorelease Summary: Higher level HTTP client library @@ -442,17 +442,23 @@ rm tests/brotli.rs %if %{with check} %check -# * run tests single-threaded to avoid clobbered environment variables: -# https://github.com/seanmonstar/reqwest/issues/2468 # * skip tests which require internet access -%cargo_test -- -- --test-threads 1 --exact --skip test_allowed_methods --skip test_badssl_modern --skip test_badssl_self_signed --skip test_tls_info +%{cargo_test -- -- --exact %{shrink: + --skip test_allowed_methods + --skip test_badssl_modern + --skip test_badssl_self_signed + --skip test_tls_info +}} %endif %changelog +## START: Generated by rpmautospec +* Sat Jan 04 2025 Fabio Valentini - 0.12.12-1 +- Update to version 0.12.12; Fixes RHBZ#2334233 + * Fri Dec 20 2024 MSVSphere Packaging Team - 0.12.9-2 - Rebuilt for MSVSphere 10 -## START: Generated by rpmautospec * Mon Nov 04 2024 Fabio Valentini - 0.12.9-2 - Run tests single-threaded to avoid clobbered environment variables