From eb765616dae2a841a1a53904ed3462dc9b7a9f47 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Thu, 19 Oct 2023 16:48:47 +0200
Subject: [PATCH] Update to version 1.18.0; Fixes RHBZ#2244888

---
 .gitignore                       |  1 +
 hyperfine-fix-metadata-auto.diff |  4 ++--
 hyperfine-fix-metadata.diff      | 19 ++++++++++---------
 rust-hyperfine.spec              | 15 +++++++--------
 sources                          |  2 +-
 5 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 44a2517..a1798eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /hyperfine-1.14.0.crate
 /hyperfine-1.16.1.crate
 /hyperfine-1.17.0.crate
+/hyperfine-1.18.0.crate
diff --git a/hyperfine-fix-metadata-auto.diff b/hyperfine-fix-metadata-auto.diff
index 6584045..fd56660 100644
--- a/hyperfine-fix-metadata-auto.diff
+++ b/hyperfine-fix-metadata-auto.diff
@@ -1,5 +1,5 @@
---- hyperfine-1.17.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ hyperfine-1.17.0/Cargo.toml	2023-06-04T15:29:04.391654+00:00
+--- hyperfine-1.18.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ hyperfine-1.18.0/Cargo.toml	2023-10-19T14:43:21.468441+00:00
 @@ -102,9 +102,6 @@
  [features]
  windows_process_extensions_main_thread_handle = []
diff --git a/hyperfine-fix-metadata.diff b/hyperfine-fix-metadata.diff
index fbdacb1..dcf902b 100644
--- a/hyperfine-fix-metadata.diff
+++ b/hyperfine-fix-metadata.diff
@@ -1,10 +1,11 @@
---- hyperfine-1.17.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ hyperfine-1.17.0/Cargo.toml	2023-06-04T15:29:12.344688+00:00
-@@ -26,7 +26,6 @@
- [profile.release]
- lto = true
- codegen-units = 1
--strip = true
+--- hyperfine-1.18.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ hyperfine-1.18.0/Cargo.toml	2023-10-19T14:43:30.241482+00:00
+@@ -54,7 +54,7 @@
+ version = "1.1"
  
- [dependencies.anyhow]
- version = "1.0"
+ [dependencies.indicatif]
+-version = "=0.17.4"
++version = "0.17.4"
+ 
+ [dependencies.rand]
+ version = "0.8"
diff --git a/rust-hyperfine.spec b/rust-hyperfine.spec
index 826374e..d376da4 100644
--- a/rust-hyperfine.spec
+++ b/rust-hyperfine.spec
@@ -1,24 +1,23 @@
-# Generated by rust2rpm 24
+# Generated by rust2rpm 25
 %bcond_without check
 
 %global crate hyperfine
 
 Name:           rust-hyperfine
-Version:        1.17.0
+Version:        1.18.0
 Release:        %autorelease
 Summary:        Command-line benchmarking tool
 
-# Upstream license specification: MIT/Apache-2.0
 License:        MIT OR Apache-2.0
 URL:            https://crates.io/crates/hyperfine
 Source:         %{crates_source}
-# Automatically generated patch to strip foreign dependencies
+# Automatically generated patch to strip dependencies and normalize metadata
 Patch:          hyperfine-fix-metadata-auto.diff
 # Manually created patch for downstream crate metadata changes
-# * drop incompatible "strip = true" cargo setting
+# * relax indicatif dependency from =0.17.4 to ^0.17.4
 Patch:          hyperfine-fix-metadata.diff
 
-BuildRequires:  rust-packaging >= 23
+BuildRequires:  cargo-rpm-macros >= 24
 
 %global _description %{expand:
 A command-line benchmarking tool.}
@@ -52,7 +51,7 @@ License:        MIT AND MPL-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR M
 %{zsh_completions_dir}/_hyperfine
 
 %prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
 %cargo_prep
 
 %generate_buildrequires
@@ -60,7 +59,7 @@ License:        MIT AND MPL-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR M
 
 %build
 %cargo_build
-%cargo_license_summary
+%{cargo_license_summary}
 %{cargo_license} > LICENSE.dependencies
 
 %install
diff --git a/sources b/sources
index c9179a0..71d5f04 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (hyperfine-1.17.0.crate) = 3101883b694bd641b83bb7b93a9b30a7e3b0c61f70473d179c5b32b6ca3cfdff339e1f80a017742e24be77cbc03891f42b6aa49da604e5ac1f6da1e76e5cfe69
+SHA512 (hyperfine-1.18.0.crate) = 8193599cad9ebf51596461bcc3eadda788c1ac3e0e11cad731c8e2e337061fab48a9df0ad866faaa7ada5b819417109b1d1df50d14a8c7fd2e90d40385d7224b