From 4de51e835cdc5bc8700c33c7af3f353db20cb277 Mon Sep 17 00:00:00 2001 From: blinxen Date: Thu, 5 Oct 2023 21:02:52 +0200 Subject: [PATCH] Update to version 0.35.0 (rhbz#2240469) --- .gitignore | 1 + gix-features-fix-metadata.diff | 17 ----------------- rust-gix-features.spec | 17 +++++++++++++---- rust2rpm.conf | 4 ++++ sources | 2 +- 5 files changed, 19 insertions(+), 22 deletions(-) delete mode 100644 gix-features-fix-metadata.diff diff --git a/.gitignore b/.gitignore index 3b6f31d..e851170 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /gix-features-0.30.0.crate /gix-features-0.32.1.crate /gix-features-0.34.0.crate +/gix-features-0.35.0.crate diff --git a/gix-features-fix-metadata.diff b/gix-features-fix-metadata.diff deleted file mode 100644 index 2e5d787..0000000 --- a/gix-features-fix-metadata.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- gix-features-0.34.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ gix-features-0.34.0/Cargo.toml 2023-09-14T18:07:58.290722+00:00 -@@ -158,14 +158,6 @@ - "flate2?/rust_backend", - "dep:thiserror", - ] --zlib-ng = [ -- "zlib", -- "flate2?/zlib-ng", --] --zlib-ng-compat = [ -- "zlib", -- "flate2?/zlib-ng-compat", --] - zlib-rust-backend = [ - "zlib", - "flate2?/rust_backend", diff --git a/rust-gix-features.spec b/rust-gix-features.spec index 6c1cb6a..7f8b8b4 100644 --- a/rust-gix-features.spec +++ b/rust-gix-features.spec @@ -5,16 +5,13 @@ %global crate gix-features Name: rust-gix-features -Version: 0.34.0 +Version: 0.35.0 Release: %autorelease Summary: Integrate various capabilities using compile-time feature flags License: MIT OR Apache-2.0 URL: https://crates.io/crates/gix-features Source: %{crates_source} -# Manually created patch for downstream crate metadata changes -# * Disable feature for compatibility with zlib-ng -Patch: gix-features-fix-metadata.diff BuildRequires: cargo-rpm-macros >= 24 @@ -147,6 +144,18 @@ use the "parallel" feature of the "%{crate}" crate. %files -n %{name}+parallel-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+prodash-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+prodash-devel %{_description} + +This package contains library source intended for building other packages which +use the "prodash" feature of the "%{crate}" crate. + +%files -n %{name}+prodash-devel +%ghost %{crate_instdir}/Cargo.toml + %package -n %{name}+progress-devel Summary: %{summary} BuildArch: noarch diff --git a/rust2rpm.conf b/rust2rpm.conf index 7c5fb4d..aad44c9 100644 --- a/rust2rpm.conf +++ b/rust2rpm.conf @@ -1,2 +1,6 @@ [DEFAULT] summary = Integrate various capabilities using compile-time feature flags +# flate2/zlib-ng is not available in fedora +unwanted-features = + zlib-ng + zlib-ng-compat diff --git a/sources b/sources index e1c7c1d..6882376 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gix-features-0.34.0.crate) = 7432a69ee5d6d548c11230d56a348329f4d52c1633c025c587178d9299ec8c095b5dd917bf85a5c63ef3d8dd180dfe2184e4d4f0cbb39bc5fb45423f12bb419e +SHA512 (gix-features-0.35.0.crate) = 364ffc5ccd46657a2f9e40590f3405da95e69119ff94e85e76307800b374a5cd8ba4b0f30c80bf0a7f90f7f9bf7551f8d72b46e7173ff6560f654f51371f250e