From 4b01b7842ae719e7396598d20508e78082a7ed18 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Thu, 11 Jan 2024 21:25:37 +0100
Subject: [PATCH] Update to version 2.4.0; Fixes RHBZ#2252585

---
 .gitignore                              |  1 +
 concurrent-queue-fix-metadata-auto.diff |  4 ++--
 concurrent-queue-fix-metadata.diff      | 23 +++++++++++++++++------
 rust-concurrent-queue.spec              | 22 +++++++++++++++++-----
 rust2rpm.conf                           |  3 ---
 sources                                 |  2 +-
 6 files changed, 38 insertions(+), 17 deletions(-)
 delete mode 100644 rust2rpm.conf

diff --git a/.gitignore b/.gitignore
index 67f9faf..ef42b8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /concurrent-queue-2.1.0.crate
 /concurrent-queue-2.2.0.crate
 /concurrent-queue-2.3.0.crate
+/concurrent-queue-2.4.0.crate
diff --git a/concurrent-queue-fix-metadata-auto.diff b/concurrent-queue-fix-metadata-auto.diff
index 61ca479..5f9ea12 100644
--- a/concurrent-queue-fix-metadata-auto.diff
+++ b/concurrent-queue-fix-metadata-auto.diff
@@ -1,5 +1,5 @@
---- concurrent-queue-2.3.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ concurrent-queue-2.3.0/Cargo.toml	2023-09-26T17:12:31.762001+00:00
+--- concurrent-queue-2.4.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ concurrent-queue-2.4.0/Cargo.toml	2024-01-11T20:23:07.099236+00:00
 @@ -62,6 +62,3 @@
  default = ["std"]
  std = []
diff --git a/concurrent-queue-fix-metadata.diff b/concurrent-queue-fix-metadata.diff
index 8a6f250..2867d8f 100644
--- a/concurrent-queue-fix-metadata.diff
+++ b/concurrent-queue-fix-metadata.diff
@@ -1,12 +1,23 @@
---- concurrent-queue-2.3.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ concurrent-queue-2.3.0/Cargo.toml	2023-09-26T17:12:36.066022+00:00
-@@ -49,9 +49,6 @@
+--- concurrent-queue-2.4.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ concurrent-queue-2.4.0/Cargo.toml	2024-01-11T20:23:14.234263+00:00
+@@ -36,10 +36,6 @@
+ [lib]
+ bench = false
+ 
+-[[bench]]
+-name = "bench"
+-harness = false
+-
+ [dependencies.crossbeam-utils]
+ version = "0.8.11"
+ default-features = false
+@@ -48,9 +44,6 @@
+ version = "1"
  optional = true
  default-features = false
- 
+-
 -[dev-dependencies.criterion]
 -version = "0.4.0"
--
+ 
  [dev-dependencies.easy-parallel]
  version = "3.1.0"
- 
diff --git a/rust-concurrent-queue.spec b/rust-concurrent-queue.spec
index 736e8af..74fa66d 100644
--- a/rust-concurrent-queue.spec
+++ b/rust-concurrent-queue.spec
@@ -1,24 +1,24 @@
-# Generated by rust2rpm 24
+# Generated by rust2rpm 25
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate concurrent-queue
 
 Name:           rust-concurrent-queue
-Version:        2.3.0
+Version:        2.4.0
 Release:        %autorelease
 Summary:        Concurrent multi-producer multi-consumer queue
 
 License:        Apache-2.0 OR MIT
 URL:            https://crates.io/crates/concurrent-queue
 Source:         %{crates_source}
-# Automatically generated patch to strip foreign dependencies
+# Automatically generated patch to strip dependencies and normalize metadata
 Patch:          concurrent-queue-fix-metadata-auto.diff
 # Manually created patch for downstream crate metadata changes
 # * drop unused, benchmark-only criterion dev-dependency
 Patch:          concurrent-queue-fix-metadata.diff
 
-BuildRequires:  rust-packaging >= 21
+BuildRequires:  cargo-rpm-macros >= 24
 
 %global _description %{expand:
 Concurrent multi-producer multi-consumer queue.}
@@ -53,6 +53,18 @@ use the "default" feature of the "%{crate}" crate.
 %files       -n %{name}+default-devel
 %ghost %{crate_instdir}/Cargo.toml
 
+%package     -n %{name}+portable-atomic-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+portable-atomic-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "portable-atomic" feature of the "%{crate}" crate.
+
+%files       -n %{name}+portable-atomic-devel
+%ghost %{crate_instdir}/Cargo.toml
+
 %package     -n %{name}+std-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -66,7 +78,7 @@ use the "std" 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 ce6e74a..0000000
--- a/rust2rpm.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[DEFAULT]
-unwanted-features =
-  portable-atomic
diff --git a/sources b/sources
index d274afa..1876d7c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (concurrent-queue-2.3.0.crate) = dcf0bfaf3c9ca1c767cc3ae8542f30f72d7d5ffc9508d7d27a34f415d932b8d39c6b18caad999f266a1f36ca6fce7e23a9f9d367c9627068da8ac0a532756e20
+SHA512 (concurrent-queue-2.4.0.crate) = 5821bb396a73692e5b033d8406c2996bc4318cebf8807e596e441a2bdc28715fc6bb8eb29b575ea318f84b748ce47341a8d23f5c4de65660f86056e99b6a8b78