From 2bf70b74cd345e4cc9184789f9c1aefccb409c85 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 10 Jan 2022 16:04:37 +0100 Subject: [PATCH 1/7] Update to version 0.8.6; Fixes RHBZ#2038602 --- .gitignore | 1 + crossbeam-utils-fix-metadata.diff | 6 +++--- rust-crossbeam-utils.spec | 17 +++++++---------- sources | 2 +- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index b1a3ba1..2f17226 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /crossbeam-utils-0.8.3.crate /crossbeam-utils-0.8.4.crate /crossbeam-utils-0.8.5.crate +/crossbeam-utils-0.8.6.crate diff --git a/crossbeam-utils-fix-metadata.diff b/crossbeam-utils-fix-metadata.diff index 31177d6..7ab288d 100644 --- a/crossbeam-utils-fix-metadata.diff +++ b/crossbeam-utils-fix-metadata.diff @@ -1,6 +1,6 @@ ---- crossbeam-utils-0.8.5/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ crossbeam-utils-0.8.5/Cargo.toml 2021-06-01T22:16:40.433988+00:00 -@@ -35,6 +35,3 @@ +--- crossbeam-utils-0.8.6/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ crossbeam-utils-0.8.6/Cargo.toml 2022-01-10T14:53:42.798543+00:00 +@@ -36,6 +36,3 @@ default = ["std"] nightly = [] std = ["lazy_static"] diff --git a/rust-crossbeam-utils.spec b/rust-crossbeam-utils.spec index ab2797a..c76dd8d 100644 --- a/rust-crossbeam-utils.spec +++ b/rust-crossbeam-utils.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 19 +# Generated by rust2rpm 20 %bcond_without check %global debug_package %{nil} %global crate crossbeam-utils Name: rust-%{crate} -Version: 0.8.5 +Version: 0.8.6 Release: %autorelease Summary: Utilities for concurrent programming @@ -18,9 +18,6 @@ Source: %{crates_source} Patch0: crossbeam-utils-fix-metadata.diff ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif BuildRequires: rust-packaging @@ -36,7 +33,7 @@ BuildArch: noarch %description devel %{_description} This package contains library source intended for building other packages which -use "%{crate}" crate. +use the "%{crate}" crate. %files devel %license LICENSE-APACHE LICENSE-MIT @@ -50,7 +47,7 @@ BuildArch: noarch %description -n %{name}+default-devel %{_description} This package contains library source intended for building other packages which -use "the default" feature of the "%{crate}" crate. +use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -62,7 +59,7 @@ BuildArch: noarch %description -n %{name}+lazy_static-devel %{_description} This package contains library source intended for building other packages which -use "the lazy_static" feature of the "%{crate}" crate. +use the "lazy_static" feature of the "%{crate}" crate. %files -n %{name}+lazy_static-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -74,7 +71,7 @@ BuildArch: noarch %description -n %{name}+nightly-devel %{_description} This package contains library source intended for building other packages which -use "the nightly" feature of the "%{crate}" crate. +use the "nightly" feature of the "%{crate}" crate. %files -n %{name}+nightly-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -86,7 +83,7 @@ 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. +use the "std" feature of the "%{crate}" crate. %files -n %{name}+std-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml diff --git a/sources b/sources index 372a7bc..42aeeba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crossbeam-utils-0.8.5.crate) = fd4d2ae10340bb96c22b31190b300aab54e96b8089fd62489e102c76a944e6a16c582a90bc40f5e188f13f841293a4b9becf30830c2ece04f3ce78c29066532f +SHA512 (crossbeam-utils-0.8.6.crate) = ee47913da20440fc5b276d68913ab86f12e05d962daa2bfa9c1dc11a0ae775ecd4029584730fa09812d691b64dcb25ec9ad2dab5284fc83962a8e219924119e9 From 161222b48eeda5157ed625f75b079a6f437e129e Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 8 Feb 2022 00:49:17 +0100 Subject: [PATCH 3/7] Update to version 0.8.7; Fixes RHBZ#2050976 --- .gitignore | 1 + crossbeam-utils-fix-metadata.diff | 7 ++++--- rust-crossbeam-utils.spec | 2 +- sources | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2f17226..da7600b 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /crossbeam-utils-0.8.4.crate /crossbeam-utils-0.8.5.crate /crossbeam-utils-0.8.6.crate +/crossbeam-utils-0.8.7.crate diff --git a/crossbeam-utils-fix-metadata.diff b/crossbeam-utils-fix-metadata.diff index 7ab288d..14e0cf5 100644 --- a/crossbeam-utils-fix-metadata.diff +++ b/crossbeam-utils-fix-metadata.diff @@ -1,9 +1,10 @@ ---- crossbeam-utils-0.8.6/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ crossbeam-utils-0.8.6/Cargo.toml 2022-01-10T14:53:42.798543+00:00 -@@ -36,6 +36,3 @@ +--- crossbeam-utils-0.8.7/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ crossbeam-utils-0.8.7/Cargo.toml 2022-02-07T23:44:49.109890+00:00 +@@ -48,7 +48,3 @@ default = ["std"] nightly = [] std = ["lazy_static"] +- -[target."cfg(crossbeam_loom)".dependencies.loom] -version = "0.5" -optional = true diff --git a/rust-crossbeam-utils.spec b/rust-crossbeam-utils.spec index c76dd8d..b5a7c02 100644 --- a/rust-crossbeam-utils.spec +++ b/rust-crossbeam-utils.spec @@ -5,7 +5,7 @@ %global crate crossbeam-utils Name: rust-%{crate} -Version: 0.8.6 +Version: 0.8.7 Release: %autorelease Summary: Utilities for concurrent programming diff --git a/sources b/sources index 42aeeba..966bb4c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crossbeam-utils-0.8.6.crate) = ee47913da20440fc5b276d68913ab86f12e05d962daa2bfa9c1dc11a0ae775ecd4029584730fa09812d691b64dcb25ec9ad2dab5284fc83962a8e219924119e9 +SHA512 (crossbeam-utils-0.8.7.crate) = b9c999f570640513c38c95fe5e50d0e89adfd27a9370952a8ee441118ffc0f092d21f6dbe7c68f653a6e766e5c1aeb209145d49542f1bdaa1f561e6707ad482b From 313f387771d4947e85ce9128fa520cd16337a7da Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 29 Mar 2022 13:00:46 +0200 Subject: [PATCH 4/7] Update to version 0.8.8; Fixes RHBZ#2064279 --- .gitignore | 1 + crossbeam-utils-fix-metadata.diff | 4 ++-- rust-crossbeam-utils.spec | 22 ++++++++++++---------- sources | 2 +- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index da7600b..5d96fa1 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /crossbeam-utils-0.8.5.crate /crossbeam-utils-0.8.6.crate /crossbeam-utils-0.8.7.crate +/crossbeam-utils-0.8.8.crate diff --git a/crossbeam-utils-fix-metadata.diff b/crossbeam-utils-fix-metadata.diff index 14e0cf5..520a738 100644 --- a/crossbeam-utils-fix-metadata.diff +++ b/crossbeam-utils-fix-metadata.diff @@ -1,5 +1,5 @@ ---- crossbeam-utils-0.8.7/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ crossbeam-utils-0.8.7/Cargo.toml 2022-02-07T23:44:49.109890+00:00 +--- crossbeam-utils-0.8.8/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ crossbeam-utils-0.8.8/Cargo.toml 2022-03-29T10:59:12.766422+00:00 @@ -48,7 +48,3 @@ default = ["std"] nightly = [] diff --git a/rust-crossbeam-utils.spec b/rust-crossbeam-utils.spec index b5a7c02..767c76b 100644 --- a/rust-crossbeam-utils.spec +++ b/rust-crossbeam-utils.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 20 +# Generated by rust2rpm 21 %bcond_without check %global debug_package %{nil} %global crate crossbeam-utils Name: rust-%{crate} -Version: 0.8.7 +Version: 0.8.8 Release: %autorelease Summary: Utilities for concurrent programming @@ -19,7 +19,7 @@ Patch0: crossbeam-utils-fix-metadata.diff ExclusiveArch: %{rust_arches} -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Utilities for concurrent programming.} @@ -36,9 +36,11 @@ This package contains library source intended for building other packages which use the "%{crate}" crate. %files devel -%license LICENSE-APACHE LICENSE-MIT -%doc CHANGELOG.md README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE-APACHE +%license %{crate_instdir}/LICENSE-MIT +%doc %{crate_instdir}/CHANGELOG.md +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -50,7 +52,7 @@ This package contains library source intended for building other packages which use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+lazy_static-devel Summary: %{summary} @@ -62,7 +64,7 @@ This package contains library source intended for building other packages which use the "lazy_static" feature of the "%{crate}" crate. %files -n %{name}+lazy_static-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+nightly-devel Summary: %{summary} @@ -74,7 +76,7 @@ This package contains library source intended for building other packages which use the "nightly" feature of the "%{crate}" crate. %files -n %{name}+nightly-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+std-devel Summary: %{summary} @@ -86,7 +88,7 @@ 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 %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 diff --git a/sources b/sources index 966bb4c..b87e4a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crossbeam-utils-0.8.7.crate) = b9c999f570640513c38c95fe5e50d0e89adfd27a9370952a8ee441118ffc0f092d21f6dbe7c68f653a6e766e5c1aeb209145d49542f1bdaa1f561e6707ad482b +SHA512 (crossbeam-utils-0.8.8.crate) = ab960afdb82863160a3fa1c21c64b35b3112725bd72fc8e0724175937f4b23d0628253032229501938cd86a8e406a59c06cb44e8bdf34619de781a84ebb46ea0 From 27b5b5aa82460748b99b9b619c3b15d48858536e Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 15 Jul 2022 13:43:03 +0200 Subject: [PATCH 5/7] Update to version 0.8.10; Fixes RHBZ#2097835 --- .gitignore | 1 + crossbeam-utils-fix-metadata.diff | 8 ++++---- rust-crossbeam-utils.spec | 18 +++++++++--------- sources | 2 +- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 5d96fa1..a3b1b88 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /crossbeam-utils-0.8.6.crate /crossbeam-utils-0.8.7.crate /crossbeam-utils-0.8.8.crate +/crossbeam-utils-0.8.10.crate diff --git a/crossbeam-utils-fix-metadata.diff b/crossbeam-utils-fix-metadata.diff index 520a738..92801bb 100644 --- a/crossbeam-utils-fix-metadata.diff +++ b/crossbeam-utils-fix-metadata.diff @@ -1,9 +1,9 @@ ---- crossbeam-utils-0.8.8/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ crossbeam-utils-0.8.8/Cargo.toml 2022-03-29T10:59:12.766422+00:00 -@@ -48,7 +48,3 @@ +--- crossbeam-utils-0.8.10/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ crossbeam-utils-0.8.10/Cargo.toml 2022-07-15T11:41:41.291758+00:00 +@@ -49,7 +49,3 @@ default = ["std"] nightly = [] - std = ["lazy_static"] + std = ["once_cell"] - -[target."cfg(crossbeam_loom)".dependencies.loom] -version = "0.5" diff --git a/rust-crossbeam-utils.spec b/rust-crossbeam-utils.spec index 767c76b..ba9a515 100644 --- a/rust-crossbeam-utils.spec +++ b/rust-crossbeam-utils.spec @@ -5,7 +5,7 @@ %global crate crossbeam-utils Name: rust-%{crate} -Version: 0.8.8 +Version: 0.8.10 Release: %autorelease Summary: Utilities for concurrent programming @@ -54,28 +54,28 @@ use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+lazy_static-devel +%package -n %{name}+nightly-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+lazy_static-devel %{_description} +%description -n %{name}+nightly-devel %{_description} This package contains library source intended for building other packages which -use the "lazy_static" feature of the "%{crate}" crate. +use the "nightly" feature of the "%{crate}" crate. -%files -n %{name}+lazy_static-devel +%files -n %{name}+nightly-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+nightly-devel +%package -n %{name}+once_cell-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+nightly-devel %{_description} +%description -n %{name}+once_cell-devel %{_description} This package contains library source intended for building other packages which -use the "nightly" feature of the "%{crate}" crate. +use the "once_cell" feature of the "%{crate}" crate. -%files -n %{name}+nightly-devel +%files -n %{name}+once_cell-devel %ghost %{crate_instdir}/Cargo.toml %package -n %{name}+std-devel diff --git a/sources b/sources index b87e4a0..c869650 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crossbeam-utils-0.8.8.crate) = ab960afdb82863160a3fa1c21c64b35b3112725bd72fc8e0724175937f4b23d0628253032229501938cd86a8e406a59c06cb44e8bdf34619de781a84ebb46ea0 +SHA512 (crossbeam-utils-0.8.10.crate) = e0ac772262677e7228e4f2e06099ca788f4906f40fe5dbfb0891431c993c7e4d755d3ad93f55570ae06c1f06df14801edb3ba4f28271c4e83c80dbba2fffe24c From ffa6ccb99ec11b75df5c6d5b4d2e31d04015ef31 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 27 Jul 2022 21:15:52 +0200 Subject: [PATCH 7/7] Update to version 0.8.11; Fixes RHBZ#2110075 --- .gitignore | 1 + crossbeam-utils-fix-metadata-auto.diff | 9 +++++++++ crossbeam-utils-fix-metadata.diff | 10 ---------- rust-crossbeam-utils.spec | 14 ++++++-------- sources | 2 +- 5 files changed, 17 insertions(+), 19 deletions(-) create mode 100644 crossbeam-utils-fix-metadata-auto.diff delete mode 100644 crossbeam-utils-fix-metadata.diff diff --git a/.gitignore b/.gitignore index a3b1b88..586dbc3 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /crossbeam-utils-0.8.7.crate /crossbeam-utils-0.8.8.crate /crossbeam-utils-0.8.10.crate +/crossbeam-utils-0.8.11.crate diff --git a/crossbeam-utils-fix-metadata-auto.diff b/crossbeam-utils-fix-metadata-auto.diff new file mode 100644 index 0000000..da139a0 --- /dev/null +++ b/crossbeam-utils-fix-metadata-auto.diff @@ -0,0 +1,9 @@ +--- crossbeam-utils-0.8.11/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ crossbeam-utils-0.8.11/Cargo.toml 1970-01-01T00:00:01+00:00 +@@ -50,6 +50,3 @@ + nightly = [] + std = ["once_cell"] + +-[target."cfg(crossbeam_loom)".dependencies.loom] +-version = "0.5" +-optional = true diff --git a/crossbeam-utils-fix-metadata.diff b/crossbeam-utils-fix-metadata.diff deleted file mode 100644 index 92801bb..0000000 --- a/crossbeam-utils-fix-metadata.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- crossbeam-utils-0.8.10/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ crossbeam-utils-0.8.10/Cargo.toml 2022-07-15T11:41:41.291758+00:00 -@@ -49,7 +49,3 @@ - default = ["std"] - nightly = [] - std = ["once_cell"] -- --[target."cfg(crossbeam_loom)".dependencies.loom] --version = "0.5" --optional = true diff --git a/rust-crossbeam-utils.spec b/rust-crossbeam-utils.spec index ba9a515..db7e353 100644 --- a/rust-crossbeam-utils.spec +++ b/rust-crossbeam-utils.spec @@ -1,21 +1,19 @@ -# Generated by rust2rpm 21 +# Generated by rust2rpm 22 %bcond_without check %global debug_package %{nil} %global crate crossbeam-utils -Name: rust-%{crate} -Version: 0.8.10 +Name: rust-crossbeam-utils +Version: 0.8.11 Release: %autorelease Summary: Utilities for concurrent programming -# Upstream license specification: MIT OR Apache-2.0 -License: MIT or ASL 2.0 +License: MIT OR Apache-2.0 URL: https://crates.io/crates/crossbeam-utils Source: %{crates_source} -# Initial patched metadata -# * drop unused loom dev-dependency -Patch0: crossbeam-utils-fix-metadata.diff +# Automatically generated patch to strip foreign dependencies +Patch: crossbeam-utils-fix-metadata-auto.diff ExclusiveArch: %{rust_arches} diff --git a/sources b/sources index c869650..ae815a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crossbeam-utils-0.8.10.crate) = e0ac772262677e7228e4f2e06099ca788f4906f40fe5dbfb0891431c993c7e4d755d3ad93f55570ae06c1f06df14801edb3ba4f28271c4e83c80dbba2fffe24c +SHA512 (crossbeam-utils-0.8.11.crate) = eeb19480ca1860953507606f6649756974f65a05883c695fa371ff6d80a9fd0b94872aad5168955b4771b38f50314364236cb39363bcafe9750b687ff92a5ed5