From 2ef4e78cde29e7fdaa9037f64f8e82ef42f56ff3 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Thu, 19 Sep 2024 16:52:04 +0200
Subject: [PATCH] Drop unused, benchmark-only bencher dev-dependency

---
 rust-zip.spec         |  7 ++++---
 rust2rpm.conf         |  2 --
 rust2rpm.toml         | 10 ++++++++++
 zip-fix-metadata.diff | 10 +++++++---
 4 files changed, 21 insertions(+), 8 deletions(-)
 delete mode 100644 rust2rpm.conf
 create mode 100644 rust2rpm.toml

diff --git a/rust-zip.spec b/rust-zip.spec
index 6da131b..5d694a1 100644
--- a/rust-zip.spec
+++ b/rust-zip.spec
@@ -1,4 +1,4 @@
-# Generated by rust2rpm 24
+# Generated by rust2rpm 26
 %bcond_without check
 %global debug_package %{nil}
 
@@ -15,9 +15,10 @@ Source:         %{crates_source}
 # Manually created patch for downstream crate metadata changes
 # * bump constant_time_eq dependency from 0.1 to 0.2
 # * bump zstd dependency from 0.11 to 0.12
+# * drop unused, benchmark-only bencher dev-dependency
 Patch:          zip-fix-metadata.diff
 
-BuildRequires:  rust-packaging >= 21
+BuildRequires:  cargo-rpm-macros >= 24
 
 %global _description %{expand:
 Library to support the reading and writing of zip files.}
@@ -221,7 +222,7 @@ use the "zstd" feature of the "%{crate}" crate.
 %ghost %{crate_instdir}/Cargo.toml
 
 %prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
 %cargo_prep
 
 %generate_buildrequires
diff --git a/rust2rpm.conf b/rust2rpm.conf
deleted file mode 100644
index f626714..0000000
--- a/rust2rpm.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[DEFAULT]
-all-features = true
diff --git a/rust2rpm.toml b/rust2rpm.toml
new file mode 100644
index 0000000..7028778
--- /dev/null
+++ b/rust2rpm.toml
@@ -0,0 +1,10 @@
+[package]
+cargo-toml-patch-comments = [
+    "bump constant_time_eq dependency from 0.1 to 0.2",
+    "bump zstd dependency from 0.11 to 0.12",
+    "drop unused, benchmark-only bencher dev-dependency",
+]
+
+[features]
+enable-all = true
+
diff --git a/zip-fix-metadata.diff b/zip-fix-metadata.diff
index 9ca5a52..a7ac1fc 100644
--- a/zip-fix-metadata.diff
+++ b/zip-fix-metadata.diff
@@ -1,5 +1,5 @@
 --- zip-0.6.6/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ zip-0.6.6/Cargo.toml	2024-01-05T12:54:04.038663+00:00
++++ zip-0.6.6/Cargo.toml	2024-09-19T14:51:23.595673+00:00
 @@ -50,7 +50,7 @@
  optional = true
  
@@ -9,12 +9,16 @@
  optional = true
  
  [dependencies.crc32fast]
-@@ -81,7 +81,7 @@
+@@ -81,11 +81,8 @@
  default-features = false
  
  [dependencies.zstd]
 -version = "0.11.2"
 +version = "0.12"
  optional = true
+-
+-[dev-dependencies.bencher]
+-version = "0.1.5"
  
- [dev-dependencies.bencher]
+ [dev-dependencies.getrandom]
+ version = "0.2.5"