From 1a23da4deb719618b89ed141ed2e015dad3b23b3 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 3 Mar 2022 14:39:53 +0100 Subject: [PATCH 2/4] Update to version 0.9.1; Fixes RHBZ#2047903 --- .gitignore | 1 + parking_lot_core-fix-metadata.diff | 12 ++++----- rust-parking_lot_core.spec | 42 ++++++++++++++---------------- sources | 2 +- 4 files changed, 28 insertions(+), 29 deletions(-) diff --git a/.gitignore b/.gitignore index 115324b..b715afe 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /parking_lot_core-0.8.2.crate /parking_lot_core-0.8.3.crate /parking_lot_core-0.8.5.crate +/parking_lot_core-0.9.1.crate diff --git a/parking_lot_core-fix-metadata.diff b/parking_lot_core-fix-metadata.diff index ae3678a..3fb0933 100644 --- a/parking_lot_core-fix-metadata.diff +++ b/parking_lot_core-fix-metadata.diff @@ -1,6 +1,6 @@ ---- parking_lot_core-0.8.5/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ parking_lot_core-0.8.5/Cargo.toml 2021-11-28T07:25:42.630098+00:00 -@@ -43,10 +43,5 @@ +--- parking_lot_core-0.9.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ parking_lot_core-0.9.1/Cargo.toml 2022-03-03T11:19:02.608679+00:00 +@@ -40,10 +40,5 @@ [features] deadlock_detection = ["petgraph", "thread-id", "backtrace"] nightly = [] @@ -8,6 +8,6 @@ -version = "0.2.8" [target."cfg(unix)".dependencies.libc] version = "0.2.95" --[target."cfg(windows)".dependencies.winapi] --version = "0.3.9" --features = ["winnt", "ntstatus", "minwindef", "winerror", "winbase", "errhandlingapi", "handleapi"] +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.32" +-features = ["Win32_Foundation", "Win32_System_LibraryLoader", "Win32_System_SystemServices", "Win32_System_WindowsProgramming"] diff --git a/rust-parking_lot_core.spec b/rust-parking_lot_core.spec index 4e39893..3108091 100644 --- a/rust-parking_lot_core.spec +++ b/rust-parking_lot_core.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 19 +# Generated by rust2rpm 21 %bcond_without check %global debug_package %{nil} %global crate parking_lot_core Name: rust-%{crate} -Version: 0.8.5 +Version: 0.9.1 Release: %autorelease Summary: Advanced API for creating custom synchronization primitives @@ -14,15 +14,12 @@ License: ASL 2.0 or MIT URL: https://crates.io/crates/parking_lot_core Source: %{crates_source} # Initial patched metadata -# * No Windows, no Redox OS +# * drop Windows- and Redox OS-specific dependencies Patch0: parking_lot_core-fix-metadata.diff ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Advanced API for creating custom synchronization primitives.} @@ -36,11 +33,12 @@ 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 -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE-APACHE +%license %{crate_instdir}/LICENSE-MIT +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -49,10 +47,10 @@ 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 +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+backtrace-devel Summary: %{summary} @@ -61,10 +59,10 @@ BuildArch: noarch %description -n %{name}+backtrace-devel %{_description} This package contains library source intended for building other packages which -use "the backtrace" feature of the "%{crate}" crate. +use the "backtrace" feature of the "%{crate}" crate. %files -n %{name}+backtrace-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+deadlock_detection-devel Summary: %{summary} @@ -73,10 +71,10 @@ BuildArch: noarch %description -n %{name}+deadlock_detection-devel %{_description} This package contains library source intended for building other packages which -use "the deadlock_detection" feature of the "%{crate}" crate. +use the "deadlock_detection" feature of the "%{crate}" crate. %files -n %{name}+deadlock_detection-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+nightly-devel Summary: %{summary} @@ -85,10 +83,10 @@ 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 +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+petgraph-devel Summary: %{summary} @@ -97,10 +95,10 @@ BuildArch: noarch %description -n %{name}+petgraph-devel %{_description} This package contains library source intended for building other packages which -use "the petgraph" feature of the "%{crate}" crate. +use the "petgraph" feature of the "%{crate}" crate. %files -n %{name}+petgraph-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+thread-id-devel Summary: %{summary} @@ -109,10 +107,10 @@ BuildArch: noarch %description -n %{name}+thread-id-devel %{_description} This package contains library source intended for building other packages which -use "the thread-id" feature of the "%{crate}" crate. +use the "thread-id" feature of the "%{crate}" crate. %files -n %{name}+thread-id-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 1c067ad..b932192 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (parking_lot_core-0.8.5.crate) = c4315df551748d1ae77655e4d9f8c90f911498856e5358009e9e02e410bb8085f006f369188b0753a298371ebd74a5c383d848b65e31b55f3462381308c83a00 +SHA512 (parking_lot_core-0.9.1.crate) = c084dc175c3d91ab19b897d0bafb736a9c2ae89242ac4e2ed87e6f73ae61862c641fa29fe6beec27602686f36a52bf5eff7a3c2138a4a8edbcaf1338e62d4df2 From 50b5f065dd668c8641a7ce16322f34d84ff81a4d Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 24 May 2022 23:01:36 +0200 Subject: [PATCH 3/4] Update to version 0.9.3; Fixes RHBZ#2070223 --- .gitignore | 1 + parking_lot_core-fix-metadata.diff | 21 ++++++++++++++------- rust-parking_lot_core.spec | 6 +++--- sources | 2 +- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index b715afe..3c7e204 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /parking_lot_core-0.8.3.crate /parking_lot_core-0.8.5.crate /parking_lot_core-0.9.1.crate +/parking_lot_core-0.9.3.crate diff --git a/parking_lot_core-fix-metadata.diff b/parking_lot_core-fix-metadata.diff index 3fb0933..c9b5d9e 100644 --- a/parking_lot_core-fix-metadata.diff +++ b/parking_lot_core-fix-metadata.diff @@ -1,13 +1,20 @@ ---- parking_lot_core-0.9.1/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ parking_lot_core-0.9.1/Cargo.toml 2022-03-03T11:19:02.608679+00:00 -@@ -40,10 +40,5 @@ - [features] - deadlock_detection = ["petgraph", "thread-id", "backtrace"] +--- parking_lot_core-0.9.3/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ parking_lot_core-0.9.3/Cargo.toml 2022-05-24T14:17:50.607577+00:00 +@@ -52,17 +52,5 @@ + ] nightly = [] + -[target."cfg(target_os = \"redox\")".dependencies.redox_syscall] -version = "0.2.8" +- [target."cfg(unix)".dependencies.libc] version = "0.2.95" +- -[target."cfg(windows)".dependencies.windows-sys] --version = "0.32" --features = ["Win32_Foundation", "Win32_System_LibraryLoader", "Win32_System_SystemServices", "Win32_System_WindowsProgramming"] +-version = "0.36.0" +-features = [ +- "Win32_Foundation", +- "Win32_System_LibraryLoader", +- "Win32_System_SystemServices", +- "Win32_System_WindowsProgramming", +-] diff --git a/rust-parking_lot_core.spec b/rust-parking_lot_core.spec index 3108091..f059205 100644 --- a/rust-parking_lot_core.spec +++ b/rust-parking_lot_core.spec @@ -5,12 +5,12 @@ %global crate parking_lot_core Name: rust-%{crate} -Version: 0.9.1 +Version: 0.9.3 Release: %autorelease Summary: Advanced API for creating custom synchronization primitives -# Upstream license specification: Apache-2.0/MIT -License: ASL 2.0 or MIT +# Upstream license specification: MIT OR Apache-2.0 +License: MIT or ASL 2.0 URL: https://crates.io/crates/parking_lot_core Source: %{crates_source} # Initial patched metadata diff --git a/sources b/sources index b932192..d0ba7eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (parking_lot_core-0.9.1.crate) = c084dc175c3d91ab19b897d0bafb736a9c2ae89242ac4e2ed87e6f73ae61862c641fa29fe6beec27602686f36a52bf5eff7a3c2138a4a8edbcaf1338e62d4df2 +SHA512 (parking_lot_core-0.9.3.crate) = fa30db0fc73b268ab8395adb8bda35d12dc15363b247a95b7c4bb848ff9b8dbfb971a20f320b4feff3317d5b533c59b62152e4c652c1809a422c5671310b30df