diff --git a/.gitignore b/.gitignore index f23e52b..0cad697 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /net2-0.2.35.crate /net2-0.2.36.crate /net2-0.2.37.crate +/net2-0.2.38.crate diff --git a/net2-fix-metadata-auto.diff b/net2-fix-metadata-auto.diff new file mode 100644 index 0000000..1f167ba --- /dev/null +++ b/net2-fix-metadata-auto.diff @@ -0,0 +1,15 @@ +--- net2-0.2.38/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ net2-0.2.38/Cargo.toml 1970-01-01T00:00:01+00:00 +@@ -40,12 +40,3 @@ + [target."cfg(any(unix, target_os=\"wasi\"))".dependencies.libc] + version = "0.2.54" + +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3" +-features = [ +- "handleapi", +- "winsock2", +- "ws2def", +- "ws2ipdef", +- "ws2tcpip", +-] diff --git a/net2-fix-metadata.diff b/net2-fix-metadata.diff deleted file mode 100644 index 99afc0f..0000000 --- a/net2-fix-metadata.diff +++ /dev/null @@ -1,9 +0,0 @@ ---- net2-0.2.37/Cargo.toml 2020-12-09T19:13:14+00:00 -+++ net2-0.2.37/Cargo.toml 2020-12-10T15:08:03.968627+00:00 -@@ -30,6 +30,3 @@ - nightly = [] - [target."cfg(any(target_os=\"redox\", unix, target_os=\"wasi\"))".dependencies.libc] - version = "0.2.54" --[target."cfg(windows)".dependencies.winapi] --version = "0.3" --features = ["handleapi", "winsock2", "ws2def", "ws2ipdef", "ws2tcpip"] diff --git a/rust-net2.spec b/rust-net2.spec index 357c6a5..d4f2fc2 100644 --- a/rust-net2.spec +++ b/rust-net2.spec @@ -1,28 +1,22 @@ -# Generated by rust2rpm 16 +# Generated by rust2rpm 23 %bcond_without check %global debug_package %{nil} %global crate net2 -Name: rust-%{crate} -Version: 0.2.37 +Name: rust-net2 +Version: 0.2.38 Release: %autorelease Summary: Extensions to the standard library's networking types as proposed in RFC 1158 # Upstream license specification: MIT/Apache-2.0 -License: MIT or ASL 2.0 +License: MIT OR Apache-2.0 URL: https://crates.io/crates/net2 Source: %{crates_source} -# Initial patched metadata -# * No windows -Patch0: net2-fix-metadata.diff +# Automatically generated patch to strip foreign dependencies +Patch: net2-fix-metadata-auto.diff -ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif - -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Extensions to the standard library's networking types as proposed in RFC 1158.} @@ -35,13 +29,14 @@ 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-MIT LICENSE-APACHE -%doc README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE-APACHE +%license %{crate_instdir}/LICENSE-MIT +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -49,11 +44,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}+duration-devel Summary: %{summary} @@ -61,11 +56,11 @@ BuildArch: noarch %description -n %{name}+duration-devel %{_description} -This package contains library source intended for building other packages -which use "duration" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "duration" feature of the "%{crate}" crate. %files -n %{name}+duration-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+nightly-devel Summary: %{summary} @@ -73,11 +68,11 @@ BuildArch: noarch %description -n %{name}+nightly-devel %{_description} -This package contains library source intended for building other packages -which use "nightly" feature of "%{crate}" crate. +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 %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 diff --git a/sources b/sources index 2e3423f..258a088 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (net2-0.2.37.crate) = 9ae70c655468c3e35ce05988626e0398a3cdf7b7343c08aaecf1267bb958329e608b814cc7be252fe085de3cf6913a1c72aad206c677459469ba4886c20206ec +SHA512 (net2-0.2.38.crate) = 7bedb1a793070125974d3e1e72b052e3406c13cabad01ddfb1db50203377f9e8a7c7c0720331c533b8b141f61edc1e5cfa99ba6800edee11f94703bc6453511c