diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5e1018f --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/concurrent-queue-2.4.0.crate diff --git a/.rust-concurrent-queue.metadata b/.rust-concurrent-queue.metadata index e69de29..548a969 100644 --- a/.rust-concurrent-queue.metadata +++ b/.rust-concurrent-queue.metadata @@ -0,0 +1 @@ +10989212f0cb3723a6aec442562888438da94021 SOURCES/concurrent-queue-2.4.0.crate diff --git a/SOURCES/concurrent-queue-2.3.0.crate b/SOURCES/concurrent-queue-2.3.0.crate deleted file mode 100644 index d70d92d..0000000 Binary files a/SOURCES/concurrent-queue-2.3.0.crate and /dev/null differ diff --git a/SOURCES/concurrent-queue-fix-metadata-auto.diff b/SOURCES/concurrent-queue-fix-metadata-auto.diff index 61ca479..5f9ea12 100644 --- a/SOURCES/concurrent-queue-fix-metadata-auto.diff +++ b/SOURCES/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/SOURCES/concurrent-queue-fix-metadata.diff b/SOURCES/concurrent-queue-fix-metadata.diff index 8a6f250..2867d8f 100644 --- a/SOURCES/concurrent-queue-fix-metadata.diff +++ b/SOURCES/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/SPECS/rust-concurrent-queue.spec b/SPECS/rust-concurrent-queue.spec index 19244f7..ba7ea99 100644 --- a/SPECS/rust-concurrent-queue.spec +++ b/SPECS/rust-concurrent-queue.spec @@ -8,27 +8,27 @@ }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} ## END: Set by rpmautospec -# 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.} @@ -63,6 +63,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 @@ -76,7 +88,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 @@ -94,9 +106,12 @@ use the "std" feature of the "%{crate}" crate. %endif %changelog -* Mon Jan 15 2024 Arkady L. Shane - 2.3.0-1 +* Mon Jan 15 2024 Arkady L. Shane - 2.4.0-1 - Rebuilt for MSVSphere 9.3 +* Thu Jan 11 2024 Fabio Valentini - 2.4.0-1 +- Update to version 2.4.0; Fixes RHBZ#2252585 + * Tue Sep 26 2023 Fabio Valentini - 2.3.0-1 - Update to version 2.3.0; Fixes RHBZ#2240656