From 5f76d7f6389a4c954820b3076bef902bb4e88201 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 25 Jan 2022 12:31:33 +0100 Subject: [PATCH 2/3] Update to version 1.1.4; Fixes RHBZ#2044117 --- .gitignore | 1 + rust-thread_local.spec | 26 +++++++------------------- sources | 2 +- thread_local-fix-metadata.diff | 17 +++++++++++++++++ 4 files changed, 26 insertions(+), 20 deletions(-) create mode 100644 thread_local-fix-metadata.diff diff --git a/.gitignore b/.gitignore index 75394da..6cbb089 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /thread_local-1.0.1.crate /thread_local-1.1.0.crate /thread_local-1.1.3.crate +/thread_local-1.1.4.crate diff --git a/rust-thread_local.spec b/rust-thread_local.spec index f52c28d..1665b87 100644 --- a/rust-thread_local.spec +++ b/rust-thread_local.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 19 +# Generated by rust2rpm 20 %bcond_without check %global debug_package %{nil} %global crate thread_local Name: rust-%{crate} -Version: 1.1.3 +Version: 1.1.4 Release: %autorelease Summary: Per-object thread-local storage @@ -13,11 +13,11 @@ Summary: Per-object thread-local storage License: ASL 2.0 or MIT URL: https://crates.io/crates/thread_local Source: %{crates_source} +# Initial patched metadata +# * drop unused, benchmark-only criterion dependency to speed up builds +Patch0: thread_local-fix-metadata.diff ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif BuildRequires: rust-packaging @@ -33,7 +33,7 @@ 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 @@ -47,23 +47,11 @@ 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 -%package -n %{name}+criterion-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+criterion-devel %{_description} - -This package contains library source intended for building other packages which -use "the criterion" feature of the "%{crate}" crate. - -%files -n %{name}+criterion-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 %cargo_prep diff --git a/sources b/sources index f81211a..6716993 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (thread_local-1.1.3.crate) = 89fe00c005b2bcbb77f2286475dc04f1400b3cd3bc165162f70c1a91f7fe98132f5d0a65e5f1bb36fd8c33617e6d548f3a68df7a2302ea3a177717c71fc112b6 +SHA512 (thread_local-1.1.4.crate) = db7ff3eb88a73d9313dd58d72397614c5aae6be1d64ead7f16535cae2857be3b27d189e7955308591ec64a0d67777fd2a62a2b124ca73facb9a2d8e0458bdbb5 diff --git a/thread_local-fix-metadata.diff b/thread_local-fix-metadata.diff new file mode 100644 index 0000000..896d065 --- /dev/null +++ b/thread_local-fix-metadata.diff @@ -0,0 +1,17 @@ +--- thread_local-1.1.4/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ thread_local-1.1.4/Cargo.toml 2022-01-24T16:20:07.354322+00:00 +@@ -21,14 +21,6 @@ + license = "Apache-2.0/MIT" + repository = "https://github.com/Amanieu/thread_local-rs" + +-[[bench]] +-name = "thread_local" +-harness = false +-required-features = ["criterion"] +-[dependencies.criterion] +-version = "0.3.3" +-optional = true +- + [dependencies.once_cell] + version = "1.5.2" +