From fc03b211d55be122fe4e5b6b903597f6ebfaa8eb Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sun, 21 Aug 2022 14:48:21 +0200 Subject: [PATCH] Update to version 2.3.0; Fixes RHBZ#2120067 --- .gitignore | 1 + ...ata.diff => polling-fix-metadata-auto.diff | 13 +++--- rust-polling.spec | 43 +++++++++---------- sources | 2 +- 4 files changed, 30 insertions(+), 29 deletions(-) rename polling-fix-metadata.diff => polling-fix-metadata-auto.diff (61%) diff --git a/.gitignore b/.gitignore index a6d3ea0..a122e23 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /polling-2.0.3.crate /polling-2.1.0.crate /polling-2.2.0.crate +/polling-2.3.0.crate diff --git a/polling-fix-metadata.diff b/polling-fix-metadata-auto.diff similarity index 61% rename from polling-fix-metadata.diff rename to polling-fix-metadata-auto.diff index 0d17746..57798ea 100644 --- a/polling-fix-metadata.diff +++ b/polling-fix-metadata-auto.diff @@ -1,13 +1,16 @@ ---- polling-2.2.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ polling-2.2.0/Cargo.toml 2021-11-11T11:36:14.986721+00:00 -@@ -34,10 +34,3 @@ - std = [] +--- polling-2.3.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ polling-2.3.0/Cargo.toml 1970-01-01T00:00:01+00:00 +@@ -60,13 +60,3 @@ [target."cfg(any(unix, target_os = \"fuchsia\", target_os = \"vxworks\"))".dependencies.libc] version = "0.2.77" + -[target."cfg(windows)".dependencies.wepoll-ffi] -version = "0.1.2" -features = ["null-overlapped-wakeups-patch"] - -[target."cfg(windows)".dependencies.winapi] -version = "0.3.9" --features = ["ioapiset", "winsock2"] +-features = [ +- "ioapiset", +- "winsock2", +-] diff --git a/rust-polling.spec b/rust-polling.spec index 9a18b61..442eade 100644 --- a/rust-polling.spec +++ b/rust-polling.spec @@ -1,28 +1,23 @@ -# Generated by rust2rpm 18 +# Generated by rust2rpm 22 %bcond_without check %global debug_package %{nil} %global crate polling -Name: rust-%{crate} -Version: 2.2.0 +Name: rust-polling +Version: 2.3.0 Release: %autorelease Summary: Portable interface to epoll, kqueue, event ports, and wepoll -# Upstream license specification: Apache-2.0 OR MIT -License: ASL 2.0 or MIT +License: Apache-2.0 OR MIT URL: https://crates.io/crates/polling Source: %{crates_source} -# Initial patched metadata -# * drop windows-specific dependencies -Patch0: polling-fix-metadata.diff +# Automatically generated patch to strip foreign dependencies +Patch: polling-fix-metadata-auto.diff ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Portable interface to epoll, kqueue, event ports, and wepoll.} @@ -35,13 +30,15 @@ BuildArch: noarch %description devel %{_description} -This package contains library source intended for building other packages -which use "%{crate}" crate. +This package contains library source intended for building other packages which +use the "%{crate}" crate. %files devel -%license LICENSE-APACHE LICENSE-MIT -%doc README.md CHANGELOG.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} @@ -49,11 +46,11 @@ BuildArch: noarch %description -n %{name}+default-devel %{_description} -This package contains library source intended for building other packages -which use "default" feature of "%{crate}" crate. +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}+std-devel Summary: %{summary} @@ -61,11 +58,11 @@ BuildArch: noarch %description -n %{name}+std-devel %{_description} -This package contains library source intended for building other packages -which use "std" feature of "%{crate}" crate. +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 fd20ead..2a5d3e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (polling-2.2.0.crate) = 6592682d6abf61341e18e5b7e6aedccc31de36016c323ee4e01ca4247d5a40be14f9f60e0602f828ce6ed55e29daa3e601e62a1d472a7ab3a75d760fb1fbd99b +SHA512 (polling-2.3.0.crate) = 2f3352c0cddd06fb85b2cb5967ced2f3e18ab9dc6b66d08155038b7398443c797bc74a88983bb999a9c87a7c47a1170e34b920b18dc0485901def84c2ac1db35