diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..980ecd9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/crossbeam-epoch-0.9.17.crate diff --git a/.rust-crossbeam-epoch.metadata b/.rust-crossbeam-epoch.metadata index e69de29..9f2e9f5 100644 --- a/.rust-crossbeam-epoch.metadata +++ b/.rust-crossbeam-epoch.metadata @@ -0,0 +1 @@ +6363a924b2573952465b29178ca2133d6030be2f SOURCES/crossbeam-epoch-0.9.17.crate diff --git a/SOURCES/crossbeam-epoch-0.9.15.crate b/SOURCES/crossbeam-epoch-0.9.15.crate deleted file mode 100644 index 835d5d7..0000000 Binary files a/SOURCES/crossbeam-epoch-0.9.15.crate and /dev/null differ diff --git a/SOURCES/crossbeam-epoch-fix-metadata-auto.diff b/SOURCES/crossbeam-epoch-fix-metadata-auto.diff index 739d999..3c23167 100644 --- a/SOURCES/crossbeam-epoch-fix-metadata-auto.diff +++ b/SOURCES/crossbeam-epoch-fix-metadata-auto.diff @@ -1,6 +1,6 @@ ---- crossbeam-epoch-0.9.15/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ crossbeam-epoch-0.9.15/Cargo.toml 2023-06-23T21:55:27.918694+00:00 -@@ -58,7 +58,6 @@ +--- crossbeam-epoch-0.9.17/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ crossbeam-epoch-0.9.17/Cargo.toml 2023-12-27T20:28:23.715342+00:00 +@@ -48,7 +48,6 @@ alloc = [] default = ["std"] loom = [ @@ -8,11 +8,11 @@ "crossbeam-utils/loom", ] nightly = ["crossbeam-utils/nightly"] -@@ -67,7 +66,3 @@ +@@ -57,7 +56,3 @@ "crossbeam-utils/std", ] -[target."cfg(crossbeam_loom)".dependencies.loom-crate] --version = "0.5" +-version = "0.7.1" -optional = true -package = "loom" diff --git a/SOURCES/crossbeam-epoch-fix-metadata.diff b/SOURCES/crossbeam-epoch-fix-metadata.diff index e847c96..9a7b58a 100644 --- a/SOURCES/crossbeam-epoch-fix-metadata.diff +++ b/SOURCES/crossbeam-epoch-fix-metadata.diff @@ -1,6 +1,6 @@ ---- crossbeam-epoch-0.9.15/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ crossbeam-epoch-0.9.15/Cargo.toml 2023-06-23T21:55:35.991725+00:00 -@@ -57,9 +57,6 @@ +--- crossbeam-epoch-0.9.17/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ crossbeam-epoch-0.9.17/Cargo.toml 2023-12-27T20:28:39.797416+00:00 +@@ -47,9 +47,6 @@ [features] alloc = [] default = ["std"] diff --git a/SPECS/rust-crossbeam-epoch.spec b/SPECS/rust-crossbeam-epoch.spec index 5948b39..1b91706 100644 --- a/SPECS/rust-crossbeam-epoch.spec +++ b/SPECS/rust-crossbeam-epoch.spec @@ -2,35 +2,33 @@ ## (rpmautospec version 0.3.5) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 2; + release_number = 1; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-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 crossbeam-epoch Name: rust-crossbeam-epoch -Version: 0.9.15 +Version: 0.9.17 Release: %autorelease Summary: Epoch-based garbage collection License: MIT OR Apache-2.0 URL: https://crates.io/crates/crossbeam-epoch Source: %{crates_source} -# Automatically generated patch to strip foreign dependencies +# Automatically generated patch to strip dependencies and normalize metadata Patch: crossbeam-epoch-fix-metadata-auto.diff # Manually created patch for downstream crate metadata changes # * drop unstable-only dependency on loom Patch: crossbeam-epoch-fix-metadata.diff -# * remove redundant clone() call to fix builds with Rust 1.73+ -Patch: 0001-Remove-redundant-clone-call-to-fix-builds-with-Rust-.patch -BuildRequires: rust-packaging >= 21 +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: Epoch-based garbage collection.} @@ -102,7 +100,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 @@ -120,6 +118,9 @@ use the "std" feature of the "%{crate}" crate. %endif %changelog +* Wed Dec 27 2023 Fabio Valentini - 0.9.17-1 +- Update to version 0.9.17; Fixes RHBZ#2254355 + * Mon Nov 20 2023 Arkady L. Shane - 0.9.15-2 - Rebuilt for MSVSphere 9.2