From 6e6afe6eddc70ce8fb4161c509ca153570bcf62f Mon Sep 17 00:00:00 2001 From: blinxen Date: Sun, 23 Jun 2024 14:52:23 +0200 Subject: [PATCH] Update to version 0.42.1 (rhbz#2274908) --- .gitignore | 1 + gix-transport-fix-metadata.diff | 10 +++++++ rust-gix-transport.spec | 53 ++++++++++++++++++++++++++++++++- rust2rpm.toml | 3 ++ sources | 2 +- 5 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 gix-transport-fix-metadata.diff diff --git a/.gitignore b/.gitignore index 6480827..4f14653 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /gix-transport-0.36.1.crate /gix-transport-0.38.0.crate /gix-transport-0.41.2.crate +/gix-transport-0.42.1.crate diff --git a/gix-transport-fix-metadata.diff b/gix-transport-fix-metadata.diff new file mode 100644 index 0000000..8fcd7b3 --- /dev/null +++ b/gix-transport-fix-metadata.diff @@ -0,0 +1,10 @@ +--- gix-transport-0.42.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ gix-transport-0.42.1/Cargo.toml 2024-07-07T07:13:49.181499+00:00 +@@ -110,7 +110,6 @@ + features = [ + "charset", + "http2", +- "macos-system-configuration", + "blocking", + ] + optional = true diff --git a/rust-gix-transport.spec b/rust-gix-transport.spec index a9dde70..2540348 100644 --- a/rust-gix-transport.spec +++ b/rust-gix-transport.spec @@ -5,13 +5,16 @@ %global crate gix-transport Name: rust-gix-transport -Version: 0.41.2 +Version: 0.42.1 Release: %autorelease Summary: Implementation of the git transport layer used by gix License: MIT OR Apache-2.0 URL: https://crates.io/crates/gix-transport Source: %{crates_source} +# Manually created patch for downstream crate metadata changes +# * Patch out macos feature of reqwest +Patch: gix-transport-fix-metadata.diff BuildRequires: cargo-rpm-macros >= 24 @@ -191,6 +194,18 @@ use the "http-client-curl" feature of the "%{crate}" crate. %files -n %{name}+http-client-curl-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+http-client-curl-rust-tls-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+http-client-curl-rust-tls-devel %{_description} + +This package contains library source intended for building other packages which +use the "http-client-curl-rust-tls" feature of the "%{crate}" crate. + +%files -n %{name}+http-client-curl-rust-tls-devel +%ghost %{crate_instdir}/Cargo.toml + %package -n %{name}+http-client-reqwest-devel Summary: %{summary} BuildArch: noarch @@ -203,6 +218,42 @@ use the "http-client-reqwest" feature of the "%{crate}" crate. %files -n %{name}+http-client-reqwest-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+http-client-reqwest-native-tls-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+http-client-reqwest-native-tls-devel %{_description} + +This package contains library source intended for building other packages which +use the "http-client-reqwest-native-tls" feature of the "%{crate}" crate. + +%files -n %{name}+http-client-reqwest-native-tls-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+http-client-reqwest-rust-tls-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+http-client-reqwest-rust-tls-devel %{_description} + +This package contains library source intended for building other packages which +use the "http-client-reqwest-rust-tls" feature of the "%{crate}" crate. + +%files -n %{name}+http-client-reqwest-rust-tls-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+http-client-reqwest-rust-tls-trust-dns-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+http-client-reqwest-rust-tls-trust-dns-devel %{_description} + +This package contains library source intended for building other packages which +use the "http-client-reqwest-rust-tls-trust-dns" feature of the "%{crate}" crate. + +%files -n %{name}+http-client-reqwest-rust-tls-trust-dns-devel +%ghost %{crate_instdir}/Cargo.toml + %package -n %{name}+pin-project-lite-devel Summary: %{summary} BuildArch: noarch diff --git a/rust2rpm.toml b/rust2rpm.toml index 1a43fc2..0931098 100644 --- a/rust2rpm.toml +++ b/rust2rpm.toml @@ -1,2 +1,5 @@ [package] summary = "Implementation of the git transport layer used by gix" +cargo-toml-patch-comments = [ + "Patch out macos feature of reqwest" +] diff --git a/sources b/sources index 214ba20..6d518d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gix-transport-0.41.2.crate) = e0f90e7be0d297009cc55e385f111b9988e7e5e8bc4b5b8206b0138f3418e4afa808ec2ec5c456a957aa8e2c9df7937db58bd9c111fe19fa2cd2c0468d23f9d3 +SHA512 (gix-transport-0.42.1.crate) = 7f1a915e6585ca9ebe18e2cee90d374f5b7c345ff1d315c88a673978ed0865f1a2fc24ea9e87f335080d13d8c84309a1e766d4d9e243859c0332ce35af48755e