From 6c38c8d4ec89ef6d061e6328d4d191aa20e597a1 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Thu, 25 Apr 2024 16:00:54 +0200
Subject: [PATCH] Update to version 1.1.8; Fixes RHBZ#2265199

---
 .gitignore                     |  1 +
 README.md                      |  3 ---
 rust-thread_local.spec         | 10 +++++-----
 rust2rpm.toml                  |  5 +++++
 sources                        |  2 +-
 thread_local-fix-metadata.diff |  9 ++++-----
 6 files changed, 16 insertions(+), 14 deletions(-)
 delete mode 100644 README.md
 create mode 100644 rust2rpm.toml

diff --git a/.gitignore b/.gitignore
index f2c544d..1d16620 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /thread_local-1.1.3.crate
 /thread_local-1.1.4.crate
 /thread_local-1.1.7.crate
+/thread_local-1.1.8.crate
diff --git a/README.md b/README.md
deleted file mode 100644
index 45e97b6..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-thread_local
-
-The rust-thread_local package
\ No newline at end of file
diff --git a/rust-thread_local.spec b/rust-thread_local.spec
index ff74260..be27076 100644
--- a/rust-thread_local.spec
+++ b/rust-thread_local.spec
@@ -1,11 +1,11 @@
-# Generated by rust2rpm 24
+# Generated by rust2rpm 26
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate thread_local
 
 Name:           rust-thread_local
-Version:        1.1.7
+Version:        1.1.8
 Release:        %autorelease
 Summary:        Per-object thread-local storage
 
@@ -13,10 +13,10 @@ License:        MIT OR Apache-2.0
 URL:            https://crates.io/crates/thread_local
 Source:         %{crates_source}
 # 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
 Patch:          thread_local-fix-metadata.diff
 
-BuildRequires:  rust-packaging >= 21
+BuildRequires:  cargo-rpm-macros >= 24
 
 %global _description %{expand:
 Per-object thread-local storage.}
@@ -63,7 +63,7 @@ use the "nightly" 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/rust2rpm.toml b/rust2rpm.toml
new file mode 100644
index 0000000..2cd7101
--- /dev/null
+++ b/rust2rpm.toml
@@ -0,0 +1,5 @@
+[package]
+cargo-toml-patch-comments = [
+    "drop unused, benchmark-only criterion dev-dependency",
+]
+
diff --git a/sources b/sources
index e475fed..bcfbb68 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (thread_local-1.1.7.crate) = 3772452c2a349fb564d29bb06e13c8ae64807db27c3ee217fa04fd0e9847e94adeea582b82ffc2d9116f31ff478eb088550caf1346c263de49b55fa17b431c31
+SHA512 (thread_local-1.1.8.crate) = 6d7e3941f43c43ac091db5d1cf2a8a3892b54b0634d9200426eadeb82015566532f04b6040085dbdcb10580ac724b6ded8416931d764d795a5f923aced66c492
diff --git a/thread_local-fix-metadata.diff b/thread_local-fix-metadata.diff
index 6bca051..99723e5 100644
--- a/thread_local-fix-metadata.diff
+++ b/thread_local-fix-metadata.diff
@@ -1,6 +1,6 @@
---- thread_local-1.1.7/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ thread_local-1.1.7/Cargo.toml	2023-02-19T21:27:42.639663+00:00
-@@ -25,19 +25,12 @@
+--- thread_local-1.1.8/Cargo.toml	1970-01-01T00:00:01+00:00
++++ thread_local-1.1.8/Cargo.toml	2024-04-25T13:59:04.312560+00:00
+@@ -26,18 +26,11 @@
  license = "MIT OR Apache-2.0"
  repository = "https://github.com/Amanieu/thread_local-rs"
  
@@ -15,8 +15,7 @@
  version = "1.5.2"
  
 -[dev-dependencies.criterion]
--version = "0.4.0"
+-version = "0.5.1"
 -
  [features]
  nightly = []
-