From 36af819561f2af0a44644c262d049de9deaf05e1 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 3 Aug 2024 15:55:49 +0200 Subject: [PATCH] Update to version 1.0.1; Fixes RHBZ#2302396 --- .gitignore | 1 + rust-shared_child.spec | 18 +++++++++--------- rust2rpm.toml | 3 +++ shared_child-fix-metadata-auto.diff | 17 ++++++++++------- sources | 2 +- 5 files changed, 24 insertions(+), 17 deletions(-) create mode 100644 rust2rpm.toml diff --git a/.gitignore b/.gitignore index 39c89bd..16c9b57 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /shared_child-0.3.3.crate /shared_child-0.3.4.crate /shared_child-1.0.0.crate +/shared_child-1.0.1.crate diff --git a/rust-shared_child.spec b/rust-shared_child.spec index afefa67..c753e93 100644 --- a/rust-shared_child.spec +++ b/rust-shared_child.spec @@ -1,21 +1,24 @@ -# Generated by rust2rpm 24 +# Generated by rust2rpm 26 %bcond_without check %global debug_package %{nil} %global crate shared_child Name: rust-shared_child -Version: 1.0.0 +Version: 1.0.1 Release: %autorelease Summary: Library for using child processes from multiple threads License: MIT URL: https://crates.io/crates/shared_child Source: %{crates_source} -# Automatically generated patch to strip foreign dependencies +# Automatically generated patch to strip dependencies and normalize metadata Patch: shared_child-fix-metadata-auto.diff -BuildRequires: rust-packaging >= 21 +BuildRequires: cargo-rpm-macros >= 24 +%if %{with check} +BuildRequires: /usr/bin/python +%endif %global _description %{expand: A library for using child processes from multiple threads.} @@ -49,7 +52,7 @@ use the "default" 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 @@ -63,10 +66,7 @@ use the "default" feature of the "%{crate}" crate. %if %{with check} %check -# * doctests try to run unversioned "python" -# * skip a test that fails with Rust 1.72 and newer: -# https://github.com/oconnor663/shared_child.rs/issues/23 -%cargo_test -- --lib -- --skip test_into_inner_after_wait +%cargo_test %endif %changelog diff --git a/rust2rpm.toml b/rust2rpm.toml new file mode 100644 index 0000000..d53579c --- /dev/null +++ b/rust2rpm.toml @@ -0,0 +1,3 @@ +[requires] +test = ["/usr/bin/python"] + diff --git a/shared_child-fix-metadata-auto.diff b/shared_child-fix-metadata-auto.diff index 8a0ec98..71446ed 100644 --- a/shared_child-fix-metadata-auto.diff +++ b/shared_child-fix-metadata-auto.diff @@ -1,9 +1,12 @@ ---- shared_child-1.0.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ shared_child-1.0.0/Cargo.toml 2023-05-17T11:08:05.223912+00:00 -@@ -23,6 +23,3 @@ - repository = "https://github.com/oconnor663/shared_child.rs" +--- shared_child-1.0.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ shared_child-1.0.1/Cargo.toml 2024-08-03T13:53:03.106201+00:00 +@@ -39,9 +39,3 @@ [target."cfg(not(windows))".dependencies.libc] version = "0.2.42" --[target."cfg(windows)".dependencies.winapi] --version = "0.3.5" --features = ["synchapi", "winbase", "winerror", "winnt"] + +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.59.0" +-features = [ +- "Win32_Foundation", +- "Win32_System_Threading", +-] diff --git a/sources b/sources index e1b2d53..9952893 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (shared_child-1.0.0.crate) = d0e16cc7253271e6468659db0d7344c2d75772dd3428f686c49ce34bfea6ba8fa010b1ba83375241bf019e77c842001c6e1ab5096af54af03586e05c3f8fc476 +SHA512 (shared_child-1.0.1.crate) = 3596285e36724fefcbfcd8c877fd66e2179dbc47ad7ddf601ed793ed74df871eaccf15184f8355f3e355aa64583d6757872d9777864347d36922cc40b731c82a