From 3ddbb88e895268d7646ebf5500744f10f47739a1 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Sun, 4 Dec 2022 14:33:19 +0100
Subject: [PATCH] Update to version 2.0.0; Fixes RHBZ#2141178

---
 .gitignore                              |  1 +
 concurrent-queue-fix-metadata-auto.diff |  9 +++++++++
 concurrent-queue-fix-metadata.diff      | 12 +++++++++++
 rust-concurrent-queue.spec              | 27 +++++++++++++++++--------
 rust2rpm.conf                           |  3 +++
 sources                                 |  2 +-
 6 files changed, 45 insertions(+), 9 deletions(-)
 create mode 100644 concurrent-queue-fix-metadata-auto.diff
 create mode 100644 concurrent-queue-fix-metadata.diff
 create mode 100644 rust2rpm.conf

diff --git a/.gitignore b/.gitignore
index 73af755..3b4a7bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /concurrent-queue-1.2.2.crate
 /concurrent-queue-1.2.3.crate
 /concurrent-queue-1.2.4.crate
+/concurrent-queue-2.0.0.crate
diff --git a/concurrent-queue-fix-metadata-auto.diff b/concurrent-queue-fix-metadata-auto.diff
new file mode 100644
index 0000000..d481556
--- /dev/null
+++ b/concurrent-queue-fix-metadata-auto.diff
@@ -0,0 +1,9 @@
+--- concurrent-queue-2.0.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ concurrent-queue-2.0.0/Cargo.toml	1970-01-01T00:00:01+00:00
+@@ -62,6 +62,3 @@
+ default = ["std"]
+ std = []
+ 
+-[target."cfg(loom)".dependencies.loom]
+-version = "0.5"
+-optional = true
diff --git a/concurrent-queue-fix-metadata.diff b/concurrent-queue-fix-metadata.diff
new file mode 100644
index 0000000..d94af30
--- /dev/null
+++ b/concurrent-queue-fix-metadata.diff
@@ -0,0 +1,12 @@
+--- concurrent-queue-2.0.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ concurrent-queue-2.0.0/Cargo.toml	2022-12-04T13:30:25.029288+00:00
+@@ -49,9 +49,6 @@
+ optional = true
+ default-features = false
+ 
+-[dev-dependencies.criterion]
+-version = "0.3.4"
+-
+ [dev-dependencies.easy-parallel]
+ version = "3.1.0"
+ 
diff --git a/rust-concurrent-queue.spec b/rust-concurrent-queue.spec
index 090083c..9d23701 100644
--- a/rust-concurrent-queue.spec
+++ b/rust-concurrent-queue.spec
@@ -1,19 +1,22 @@
-# Generated by rust2rpm 22
+# Generated by rust2rpm 23
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate concurrent-queue
 
 Name:           rust-concurrent-queue
-Version:        1.2.4
+Version:        2.0.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}
-
-ExclusiveArch:  %{rust_arches}
+# Automatically generated patch to strip foreign dependencies
+Patch:          concurrent-queue-fix-metadata-auto.diff
+# Manually created patch for downstream crate metadata changes
+# * drop unused, benchmark-only criterion dev-dependency to speed up builds
+Patch:          concurrent-queue-fix-metadata.diff
 
 BuildRequires:  rust-packaging >= 21
 
@@ -50,6 +53,18 @@ use the "default" feature of the "%{crate}" crate.
 %files       -n %{name}+default-devel
 %ghost %{crate_instdir}/Cargo.toml
 
+%package     -n %{name}+std-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+std-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "std" feature of the "%{crate}" crate.
+
+%files       -n %{name}+std-devel
+%ghost %{crate_instdir}/Cargo.toml
+
 %prep
 %autosetup -n %{crate}-%{version_no_tilde} -p1
 %cargo_prep
@@ -65,12 +80,8 @@ use the "default" feature of the "%{crate}" crate.
 
 %if %{with check}
 %check
-%ifnarch s390x
-# * some tests fail or get stuck on s390x when compiled with LLVM 13:
-#   https://github.com/smol-rs/concurrent-queue/issues/21
 %cargo_test
 %endif
-%endif
 
 %changelog
 %autochangelog
diff --git a/rust2rpm.conf b/rust2rpm.conf
new file mode 100644
index 0000000..ce6e74a
--- /dev/null
+++ b/rust2rpm.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+unwanted-features =
+  portable-atomic
diff --git a/sources b/sources
index 24c8f55..900daf1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (concurrent-queue-1.2.4.crate) = 4c0c81f02bc10b1ac25880f7a9647d787742f694a8cbc6aa921cb76c5416bae7ad94eab857e48d56a42243a96cc86bb0b7e18651021d281cca90d77a644d941a
+SHA512 (concurrent-queue-2.0.0.crate) = e518fb6c25424f49eceff427a5a4840ef277eceb8bde40c73604e798397eb4733b513de26f147093012a0addaced14540b88b411d176b95065f3cc60788c3e08