From 14d905928c8eaa4bcd341e04df67c4f5a58aea60 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Thu, 27 Jul 2023 22:09:33 +0200
Subject: [PATCH] Update to version 0.32.1; Fixes RHBZ#2218496

---
 .gitignore                     |  1 +
 gix-features-fix-metadata.diff | 28 +++++++++++++++++++
 rust-gix-features.spec         | 51 ++++++++++++++--------------------
 sources                        |  2 +-
 4 files changed, 51 insertions(+), 31 deletions(-)
 create mode 100644 gix-features-fix-metadata.diff

diff --git a/.gitignore b/.gitignore
index 8dd7597..0db56ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /gix-features-0.30.0.crate
+/gix-features-0.32.1.crate
diff --git a/gix-features-fix-metadata.diff b/gix-features-fix-metadata.diff
new file mode 100644
index 0000000..a5b7374
--- /dev/null
+++ b/gix-features-fix-metadata.diff
@@ -0,0 +1,28 @@
+--- gix-features-0.32.1/Cargo.toml	1970-01-01T00:00:01+00:00
++++ gix-features-0.32.1/Cargo.toml	2023-07-27T20:04:39.790745+00:00
+@@ -78,10 +78,6 @@
+ version = "0.5.0"
+ optional = true
+ 
+-[dependencies.document-features]
+-version = "0.2.0"
+-optional = true
+-
+ [dependencies.flate2]
+ version = "1.0.25"
+ optional = true
+@@ -158,14 +154,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 077e5ec..0872527 100644
--- a/rust-gix-features.spec
+++ b/rust-gix-features.spec
@@ -5,14 +5,17 @@
 %global crate gix-features
 
 Name:           rust-gix-features
-Version:        0.30.0
+Version:        0.32.1
 Release:        %autorelease
 Summary:        Integrate various capabilities using compile-time feature flags
 
-# Upstream license specification: MIT/Apache-2.0
 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 that is only required for building documentation
+# * Disable feature for compatibility with zlib-ng
+Patch:          gix-features-fix-metadata.diff
 
 BuildRequires:  cargo-rpm-macros >= 24
 
@@ -73,18 +76,6 @@ use the "crc32" feature of the "%{crate}" crate.
 %files       -n %{name}+crc32-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+document-features-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+document-features-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "document-features" feature of the "%{crate}" crate.
-
-%files       -n %{name}+document-features-devel
-%ghost %{crate_instdir}/Cargo.toml
-
 %package     -n %{name}+fast-sha1-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -193,52 +184,52 @@ use the "rustsha1" feature of the "%{crate}" crate.
 %files       -n %{name}+rustsha1-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+walkdir-devel
+%package     -n %{name}+tracing-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+walkdir-devel %{_description}
+%description -n %{name}+tracing-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "walkdir" feature of the "%{crate}" crate.
+use the "tracing" feature of the "%{crate}" crate.
 
-%files       -n %{name}+walkdir-devel
+%files       -n %{name}+tracing-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+zlib-devel
+%package     -n %{name}+tracing-detail-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+zlib-devel %{_description}
+%description -n %{name}+tracing-detail-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "zlib" feature of the "%{crate}" crate.
+use the "tracing-detail" feature of the "%{crate}" crate.
 
-%files       -n %{name}+zlib-devel
+%files       -n %{name}+tracing-detail-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+zlib-ng-devel
+%package     -n %{name}+walkdir-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+zlib-ng-devel %{_description}
+%description -n %{name}+walkdir-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "zlib-ng" feature of the "%{crate}" crate.
+use the "walkdir" feature of the "%{crate}" crate.
 
-%files       -n %{name}+zlib-ng-devel
+%files       -n %{name}+walkdir-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+zlib-ng-compat-devel
+%package     -n %{name}+zlib-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+zlib-ng-compat-devel %{_description}
+%description -n %{name}+zlib-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "zlib-ng-compat" feature of the "%{crate}" crate.
+use the "zlib" feature of the "%{crate}" crate.
 
-%files       -n %{name}+zlib-ng-compat-devel
+%files       -n %{name}+zlib-devel
 %ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+zlib-rust-backend-devel
diff --git a/sources b/sources
index 2745fff..37cb524 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gix-features-0.30.0.crate) = dca56f70ab3ea9b7f8ee1415ac688da97c03565076b53cb4120931c3599422ba34d3b23568b1bd81fba07c1d93a07bcd80a8aa6d3111745bed496ce3659efc65
+SHA512 (gix-features-0.32.1.crate) = 182e592fb1d5ad90e4420d57743f41bb2780e96193c452d68525871d8c2adb39fb9ced33b68b2a7ff41cd36c85a7df8f2974f6a82cfbe55636df66908a6e39ca