[rpms/rust-onefetch] epel9: Update to version 2.28.1; Fixes RHBZ#2525976

[rpms/rust-onefetch] epel9: Update to version 2.28.1; Fixes RHBZ#2525976

[Benjamin A. Beasley]

A new commit has been pushed.

Repo   : rpms/rust-onefetch
Branch : epel9
Commit : 4a46fc7ea82e99f8be59507ad94910d6ae6a1b7b
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date   : 2026-09-02T11:49:50+01:00
Stats  : +80/-50 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/rust-onefetch/c/4a46fc7ea82e99f8be59507ad94910d6ae6a1b7b?branch=epel9

Log:
Update to version 2.28.1; Fixes RHBZ#2525976

---
diff --git a/0001-Revert-chore-deps-Update-Rust-crate-gix-to-0.86.0-18.patch b/0001-Revert-chore-deps-Update-Rust-crate-gix-to-0.86.0-18.patch
new file mode 100644
index 0000000..e4585d7
--- /dev/null
+++ b/0001-Revert-chore-deps-Update-Rust-crate-gix-to-0.86.0-18.patch
@@ -0,0 +1,26 @@
+From 5eaab9f257434ca710700a8ce0cffa9c65e2bb41 Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code@musicinmybrain.net>
+Date: Wed, 2 Sep 2026 11:45:37 +0100
+Subject: [PATCH] Revert "chore(deps): Update Rust crate gix to 0.86.0 (#1838)"
+
+This reverts commit f43b0cb3ad4076974e942b54751ee462ce2a6ca5.
+---
+ src/info/project.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/info/project.rs b/src/info/project.rs
+index a7bb71b..56274fd 100644
+--- a/src/info/project.rs
++++ b/src/info/project.rs
+@@ -40,7 +40,7 @@ fn get_repo_name(repo_url: &str, manifest: Option<&Manifest>) -> Result<String>
+     if repo_url.is_empty() {
+         return Ok(String::default());
+     }
+-    let url = gix::url::parse(repo_url)?;
++    let url = gix::url::parse(repo_url.into())?;
+     let path = gix::path::from_bstr(url.path.as_bstr());
+     let repo_name = path
+         .with_extension("")
+-- 
+2.55.0
+

diff --git a/onefetch-fix-metadata-auto.diff b/onefetch-fix-metadata-auto.diff
index b4aa2f3..23b1490 100644
--- a/onefetch-fix-metadata-auto.diff
+++ b/onefetch-fix-metadata-auto.diff
@@ -1,7 +1,7 @@
---- onefetch-2.27.1/Cargo.toml	2006-07-24T01:21:28+00:00
-+++ onefetch-2.27.1/Cargo.toml	2026-07-04T09:41:50.139050+00:00
-@@ -177,8 +177,3 @@
- version = "1.20.1"
+--- onefetch-2.28.1/Cargo.toml	2006-07-24T01:21:28+00:00
++++ onefetch-2.28.1/Cargo.toml	2026-09-02T10:49:33.580521+00:00
+@@ -193,8 +193,3 @@
+ version = "2.3.0"
  default-features = false
  
 -[target."cfg(windows)".dependencies.enable-ansi-support]

diff --git a/onefetch-fix-metadata.diff b/onefetch-fix-metadata.diff
index ce217a4..91488e7 100644
--- a/onefetch-fix-metadata.diff
+++ b/onefetch-fix-metadata.diff
@@ -1,6 +1,6 @@
---- onefetch-2.27.1/Cargo.toml	2006-07-24T01:21:28+00:00
-+++ onefetch-2.27.1/Cargo.toml	2026-07-04T09:41:54.824103+00:00
-@@ -45,10 +45,6 @@
+--- onefetch-2.28.1/Cargo.toml	2006-07-24T01:21:28+00:00
++++ onefetch-2.28.1/Cargo.toml	2026-09-02T10:49:33.581805+00:00
+@@ -69,10 +69,6 @@
  name = "onefetch"
  path = "src/main.rs"
  
@@ -11,46 +11,34 @@
  [[bench]]
  name = "repo"
  path = "benches/repo.rs"
-@@ -71,18 +67,16 @@
- version = "4.5.65"
+@@ -95,7 +91,7 @@
+ version = "4.6.9"
  
  [dependencies.gix]
--version = "0.80.0"
-+version = "0.85.0"
+-version = "0.87.1"
++version = "0.85"
  features = [
      "max-performance-safe",
      "blob-diff",
-     "mailmap",
-     "index",
-     "status",
-+    "sha1",
- ]
- default-features = false
--
--[dependencies.gix-features]
--version = "0.46.0"
- 
- [dependencies.globset]
- version = "0.4.18"
-@@ -128,7 +122,7 @@
- version = "0.9.34"
+@@ -110,7 +106,7 @@
+ version = "0.4.20"
  
- [dependencies.strum]
--version = "0.28.0"
-+version = ">=0.27.0, <0.29.0"
- features = ["derive"]
- 
- [dependencies.time]
-@@ -144,12 +138,6 @@
+ [dependencies.human-panic]
+-version = "2.0.8"
++version = "2.0.6"
  
+ [dependencies.image]
+ version = "0.25.10"
+@@ -161,12 +157,6 @@
  [dependencies.typetag]
- version = "0.2.21"
--
+ version = "0.2.23"
+ 
 -[dev-dependencies.criterion]
 -version = "0.8.2"
 -
 -[dev-dependencies.gix-testtools]
--version = "0.18.0"
- 
+-version = "0.20.0"
+-
  [dev-dependencies.insta]
- version = "1.46.3"
+ version = "1.48.0"
+ features = [

diff --git a/rust-onefetch.spec b/rust-onefetch.spec
index 6c988e1..d24bafc 100644
--- a/rust-onefetch.spec
+++ b/rust-onefetch.spec
@@ -7,7 +7,7 @@
 %global crate onefetch
 
 Name:           rust-onefetch
-Version:        2.27.1
+Version:        2.28.1
 Release:        %autorelease
 Summary:        Command-line Git information tool
 
@@ -18,17 +18,22 @@ Source:         %{crates_source}
 Patch:          onefetch-fix-metadata-auto.diff
 # Manually created patch for downstream crate metadata changes
 # * Do not depend on criterion; it is needed only for benchmarks
-# * Bump gix to version 0.85: https://github.com/o2sh/onefetch/pull/1740,
-#   https://github.com/o2sh/onefetch/pull/1783
-# * Remove direct dependency on gix-features:
-#   https://github.com/o2sh/onefetch/pull/1720
-# * Allow older strum 0.27 for EPEL10.2 and older
+# * Use older gix 0.85 (upstream wants 0.87):
+#   https://bugzilla.redhat.com/show_bug.cgi?id=2506441. We must carry a
+#   downstream patch reverting the source-code change from
+#   https://github.com/o2sh/onefetch/commit/f43b0cb3ad4076974e942b54751ee462ce2a6ca5;
+#   this patch must be removed when we are ready to update to gix 0.86+.
+# * Allow human-panic 2.0.6 for now (upstream wants 2.0.8):
+#   https://bugzilla.redhat.com/show_bug.cgi?id=2453435
 # * Patch out tests/repo.rs, which requires gix-testtools, and remove the
 #   dev-dependency on gix-testtools. In theory, we could package gix-testtools,
 #   but the maintainer of the gix stack in Fedora does not intend to do so,
 #   reasonably citing upstream discouragement in
 #   https://github.com/Byron/gitoxide/discussions/900.
 Patch:          onefetch-fix-metadata.diff
+# * Downstream-only: revert the source-code change for gix 0.86+ so we can
+#   temporarily keep using gix 0.85.
+Patch10:        0001-Revert-chore-deps-Update-Rust-crate-gix-to-0.86.0-18.patch
 
 BuildRequires:  cargo-rpm-macros >= 26
 BuildRequires:  help2man

diff --git a/rust2rpm.toml b/rust2rpm.toml
index 22a0841..ffa4731 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -2,15 +2,16 @@
 cargo-toml-patch-comments = [
     "Do not depend on criterion; it is needed only for benchmarks",
     """\
-Bump gix to version 0.85: \
-https://github.com/o2sh/onefetch/pull/1740, \
-https://github.com/o2sh/onefetch/pull/1783\
+Use older gix 0.85 (upstream wants 0.87): \
+https://bugzilla.redhat.com/show_bug.cgi?id=2506441. We must carry a \
+downstream patch reverting the source-code change from \
+https://github.com/o2sh/onefetch/commit/f43b0cb3ad4076974e942b54751ee462ce2a6ca5; \
+this patch must be removed when we are ready to update to gix 0.86+.\
 """,
     """\
-Remove direct dependency on gix-features: \
-https://github.com/o2sh/onefetch/pull/1720\
+Allow human-panic 2.0.6 for now (upstream wants 2.0.8): \
+https://bugzilla.redhat.com/show_bug.cgi?id=2453435\
 """,
-    "Allow older strum 0.27 for EPEL10.2 and older",
     """\
 Patch out tests/repo.rs, which requires gix-testtools, and remove the \
 dev-dependency on gix-testtools. In theory, we could package gix-testtools, but \
@@ -36,6 +37,16 @@ extra-files = [
 # library. This could be revisited if the situation changes.
 cargo-install-lib = false
 
+[[package.extra-patches]]
+number = 10
+file = "0001-Revert-chore-deps-Update-Rust-crate-gix-to-0.86.0-18.patch"
+comments = [
+    """\
+Downstream-only: revert the source-code change for gix 0.86+ so we can
+temporarily keep using gix 0.85.\
+""",
+]
+
 [requires]
 build = [
     "help2man",

diff --git a/sources b/sources
index 5df9b20..2be190e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (onefetch-2.27.1.crate) = 190b91c85de2896fe2b4664ed6bffd66e9aeb66cd22f4c007531f0d84efaa4e50097e034e820f7165501c7efdaad1450b257265f2f2163880c8c848640cad65a
+SHA512 (onefetch-2.28.1.crate) = 7e997d2c26b291af22ca3cd8189f96d0780deb5b5ab2e31ff63f92471c9f3697992401f5b26b9a2931b02a7c75d8c918e8308d8706a94277a2c3f7962f269cdf