From 0a2dece9ee57b71efa819924b33f025a67085162 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 17 Oct 2023 12:22:10 +0200 Subject: [PATCH] Update to version 4.2.1; Fixes RHBZ#2244542 --- .gitignore | 1 + rust-thread-id.spec | 11 ++++++----- sources | 2 +- thread-id-fix-metadata-auto.diff | 11 ++++------- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 9a7cfcc..06176e1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /thread-id-4.0.0.crate /thread-id-4.1.0.crate /thread-id-4.2.0.crate +/thread-id-4.2.1.crate diff --git a/rust-thread-id.spec b/rust-thread-id.spec index 76c29e6..527ef3e 100644 --- a/rust-thread-id.spec +++ b/rust-thread-id.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 24 +# Generated by rust2rpm 25 %bcond_without check %global debug_package %{nil} %global crate thread-id Name: rust-thread-id -Version: 4.2.0 +Version: 4.2.1 Release: %autorelease Summary: Get a unique thread ID @@ -13,10 +13,10 @@ Summary: Get a unique thread ID License: MIT OR Apache-2.0 URL: https://crates.io/crates/thread-id Source: %{crates_source} -# Automatically generated patch to strip foreign dependencies +# Automatically generated patch to strip dependencies and normalize metadata Patch: thread-id-fix-metadata-auto.diff -BuildRequires: rust-packaging >= 21 +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: Get a unique thread ID.} @@ -36,6 +36,7 @@ use the "%{crate}" crate. %license %{crate_instdir}/license-apache %license %{crate_instdir}/license-mit %doc %{crate_instdir}/changelog.md +%doc %{crate_instdir}/contributing.md %doc %{crate_instdir}/readme.md %{crate_instdir}/ @@ -52,7 +53,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 diff --git a/sources b/sources index 0df2619..cf115f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (thread-id-4.2.0.crate) = 0c9a608c6839b6261a653d9911e92d9e3793823510cf389c9908c0b9a6744fe49d3d3a9612316cc4d665c439e3b62386fab30f5fe9509f29e7a6912902d4004a +SHA512 (thread-id-4.2.1.crate) = 91b07c01dbcf9a0b3edd6fd14f9f60ea26ed0cc8b21972e40fa2e34a0fa4abba1c71106994972929a99d9542bb186cc814406ee7979212526a69c5a8a49950c2 diff --git a/thread-id-fix-metadata-auto.diff b/thread-id-fix-metadata-auto.diff index aa86cc2..caa0a07 100644 --- a/thread-id-fix-metadata-auto.diff +++ b/thread-id-fix-metadata-auto.diff @@ -1,13 +1,10 @@ ---- thread-id-4.2.0/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ thread-id-4.2.0/Cargo.toml 2023-08-23T09:32:43.246091+00:00 -@@ -20,10 +20,5 @@ - keywords = ["thread", "pthread", "getcurrentthreadid"] - license = "MIT/Apache-2.0" +--- thread-id-4.2.1/Cargo.toml 1970-01-01T00:00:00+00:00 ++++ thread-id-4.2.1/Cargo.toml 2023-10-17T10:20:41.246114+00:00 +@@ -22,6 +22,4 @@ repository = "https://github.com/ruuda/thread-id" --[target."cfg(target_os = \"redox\")".dependencies.redox_syscall] --version = "0.2" [target."cfg(unix)".dependencies.libc] version = "0.2.147" -[target."cfg(windows)".dependencies.winapi] -version = "0.3" -features = ["processthreadsapi"] ++