From 2b556d96ee62740fd7e67175f494b1575bdb216f Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Mon, 10 Jun 2024 17:06:09 +0200
Subject: [PATCH] Regenerate with rust2rpm v26

---
 flume-fix-metadata.diff    | 12 ++++++++++++
 rust-flume-criterion.patch | 13 -------------
 rust-flume.spec            | 11 ++++++-----
 rust2rpm.toml              |  5 +++++
 4 files changed, 23 insertions(+), 18 deletions(-)
 create mode 100644 flume-fix-metadata.diff
 delete mode 100644 rust-flume-criterion.patch
 create mode 100644 rust2rpm.toml

diff --git a/flume-fix-metadata.diff b/flume-fix-metadata.diff
new file mode 100644
index 0000000..1d89be9
--- /dev/null
+++ b/flume-fix-metadata.diff
@@ -0,0 +1,12 @@
+--- flume-0.11.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ flume-0.11.0/Cargo.toml	2024-06-10T15:02:13.134717+00:00
+@@ -66,9 +66,6 @@
+     "unstable",
+ ]
+ 
+-[dev-dependencies.criterion]
+-version = "0.3.4"
+-
+ [dev-dependencies.crossbeam-channel]
+ version = "0.5.5"
+ 
diff --git a/rust-flume-criterion.patch b/rust-flume-criterion.patch
deleted file mode 100644
index 1032c78..0000000
--- a/rust-flume-criterion.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up flume-0.10.14/Cargo.toml.criterion flume-0.10.14/Cargo.toml
---- flume-0.10.14/Cargo.toml.criterion	1969-12-31 17:00:01.000000000 -0700
-+++ flume-0.10.14/Cargo.toml	2022-10-19 08:48:19.949933517 -0600
-@@ -69,9 +69,6 @@ features = [
-     "unstable",
- ]
- 
--[dev-dependencies.criterion]
--version = "0.3.4"
--
- [dev-dependencies.crossbeam-channel]
- version = "0.5.5"
- 
diff --git a/rust-flume.spec b/rust-flume.spec
index 20808a4..ae5e0f3 100644
--- a/rust-flume.spec
+++ b/rust-flume.spec
@@ -1,4 +1,4 @@
-# Generated by rust2rpm 24
+# Generated by rust2rpm 26
 %bcond_without check
 %global debug_package %{nil}
 
@@ -13,10 +13,11 @@ Summary:        Blazingly fast multi-producer channel
 License:        Apache-2.0 OR MIT
 URL:            https://crates.io/crates/flume
 Source:         %{crates_source}
-# Remove criterion dev dependency
-Patch:          rust-flume-criterion.patch
+# Manually created patch for downstream crate metadata changes
+# * drop unused, benchmark-only criterion dev-dependency
+Patch:          flume-fix-metadata.diff
 
-BuildRequires:  rust-packaging >= 21
+BuildRequires:  cargo-rpm-macros >= 24
 
 %global _description %{expand:
 A blazingly fast multi-producer channel.}
@@ -136,7 +137,7 @@ use the "spin" 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.toml b/rust2rpm.toml
new file mode 100644
index 0000000..2cd7101
--- /dev/null
+++ b/rust2rpm.toml
@@ -0,0 +1,5 @@
+[package]
+cargo-toml-patch-comments = [
+    "drop unused, benchmark-only criterion dev-dependency",
+]
+