Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -5,3 +5,5 @@
 /thread_local-1.1.0.crate
 /thread_local-1.1.3.crate
 /thread_local-1.1.4.crate
+/thread_local-1.1.7.crate
+/thread_local-1.1.8.crate

README.md

@@ -1,3 +0,0 @@
-# rust-thread_local
-
-The rust-thread_local package

rust-thread_local.spec

@@ -1,25 +1,22 @@
-# Generated by rust2rpm 20
+# Generated by rust2rpm 26
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate thread_local
 
-Name:           rust-%{crate}
+Name:           rust-thread_local
-Version:        1.1.4
+Version:        1.1.8
 Release:        %autorelease
 Summary:        Per-object thread-local storage
 
-# Upstream license specification: Apache-2.0/MIT
+License:        MIT OR Apache-2.0
-License:        ASL 2.0 or MIT
 URL:            https://crates.io/crates/thread_local
 Source:         %{crates_source}
-# Initial patched metadata
+# Manually created patch for downstream crate metadata changes
-# * drop unused, benchmark-only criterion dependency to speed up builds
+# * drop unused, benchmark-only criterion dev-dependency
-Patch0:         thread_local-fix-metadata.diff
+Patch:          thread_local-fix-metadata.diff
 
-ExclusiveArch:  %{rust_arches}
+BuildRequires:  cargo-rpm-macros >= 24
-
-BuildRequires:  rust-packaging
 
 %global _description %{expand:
 Per-object thread-local storage.}
@@ -36,9 +33,10 @@ This package contains library source intended for building other packages which
 use the "%{crate}" crate.
 
 %files          devel
-%license LICENSE-APACHE LICENSE-MIT
+%license %{crate_instdir}/LICENSE-APACHE
-%doc README.md
+%license %{crate_instdir}/LICENSE-MIT
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
 
 %package     -n %{name}+default-devel
 Summary:        %{summary}
@@ -50,10 +48,22 @@ 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}+nightly-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+nightly-devel %{_description}
+
+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 %{crate_instdir}/Cargo.toml
 
 %prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
 %cargo_prep
 
 %generate_buildrequires

rust2rpm.toml

@@ -0,0 +1,5 @@
+[package]
+cargo-toml-patch-comments = [
+    "drop unused, benchmark-only criterion dev-dependency",
+]
+

sources

@@ -1 +1 @@
-SHA512 (thread_local-1.1.4.crate) = db7ff3eb88a73d9313dd58d72397614c5aae6be1d64ead7f16535cae2857be3b27d189e7955308591ec64a0d67777fd2a62a2b124ca73facb9a2d8e0458bdbb5
+SHA512 (thread_local-1.1.8.crate) = 6d7e3941f43c43ac091db5d1cf2a8a3892b54b0634d9200426eadeb82015566532f04b6040085dbdcb10580ac724b6ded8416931d764d795a5f923aced66c492

thread_local-fix-metadata.diff

@@ -1,17 +1,21 @@
---- thread_local-1.1.4/Cargo.toml	1970-01-01T00:00:01+00:00
+--- thread_local-1.1.8/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ thread_local-1.1.4/Cargo.toml	2022-01-24T16:20:07.354322+00:00
++++ thread_local-1.1.8/Cargo.toml	2024-04-25T13:59:04.312560+00:00
-@@ -21,14 +21,6 @@
+@@ -26,18 +26,11 @@
- license = "Apache-2.0/MIT"
+ license = "MIT OR Apache-2.0"
  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.cfg-if]
+ version = "1.0.0"
+ 
  [dependencies.once_cell]
  version = "1.5.2"
  
+-[dev-dependencies.criterion]
+-version = "0.5.1"
+-
+ [features]
+ nightly = []