From 5d1a814a2e5fc13c1661ef8c49d4a89968061172 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Fri, 3 Jan 2025 17:56:34 +0100
Subject: [PATCH] Update to version 0.2.0; Fixes RHBZ#2329274

---
 .gitignore                           |  1 +
 rust-tracing-serde.spec              | 12 ++++++------
 sources                              |  2 +-
 tracing-serde-fix-metadata-auto.diff | 25 +++++++++++++++++--------
 tracing-serde-fix-metadata.diff      | 12 ++++++++----
 5 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4f715bc..9ab0b92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /tracing-serde-0.1.3.crate
+/tracing-serde-0.2.0.crate
diff --git a/rust-tracing-serde.spec b/rust-tracing-serde.spec
index d8662b8..4023867 100644
--- a/rust-tracing-serde.spec
+++ b/rust-tracing-serde.spec
@@ -1,24 +1,24 @@
-# Generated by rust2rpm 24
-%bcond_without check
+# Generated by rust2rpm 27
+%bcond check 1
 %global debug_package %{nil}
 
 %global crate tracing-serde
 
 Name:           rust-tracing-serde
-Version:        0.1.3
+Version:        0.2.0
 Release:        %autorelease
 Summary:        Compatibility layer for serializing trace data with serde
 
 License:        MIT
 URL:            https://crates.io/crates/tracing-serde
 Source:         %{crates_source}
-# Automatically generated patch to strip foreign dependencies
+# Automatically generated patch to strip dependencies and normalize metadata
 Patch:          tracing-serde-fix-metadata-auto.diff
 # Manually created patch for downstream crate metadata changes
 # * drop unstable valuable feature
 Patch:          tracing-serde-fix-metadata.diff
 
-BuildRequires:  rust-packaging >= 21
+BuildRequires:  cargo-rpm-macros >= 24
 
 %global _description %{expand:
 A compatibility layer for serializing trace data with `serde`.}
@@ -53,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 ad13fad..ea4256d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tracing-serde-0.1.3.crate) = 3822ac747df404c33573ad2a5c722f9708066a72c2893dbf507563ef29bebcab79cec17515fa87c0fa64be8a08073c38ab57ccc463c74df8caf3df69c72e131b
+SHA512 (tracing-serde-0.2.0.crate) = d5914943ca8a80959287117d5d5f3fee0f01baa49cef02002bbd00507743e06c3c5df31a346dce54b9d5d20358fd512d4ae54a0956f1dd334b9bf0c7e7594823
diff --git a/tracing-serde-fix-metadata-auto.diff b/tracing-serde-fix-metadata-auto.diff
index df97e43..db1f078 100644
--- a/tracing-serde-fix-metadata-auto.diff
+++ b/tracing-serde-fix-metadata-auto.diff
@@ -1,20 +1,29 @@
---- tracing-serde-0.1.3/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ tracing-serde-0.1.3/Cargo.toml	2023-03-01T21:27:58.938813+00:00
-@@ -30,16 +30,6 @@
- version = "1"
+--- tracing-serde-0.2.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ tracing-serde-0.2.0/Cargo.toml	2025-01-03T16:54:37.845621+00:00
+@@ -55,21 +55,8 @@
  
  [features]
--valuable = ["valuable_crate", "valuable-serde", "tracing-core/valuable"]
+ valuable = [
+-    "valuable_crate",
+-    "valuable-serde",
+     "tracing-core/valuable",
+ ]
+-
 -[target."cfg(tracing_unstable)".dependencies.valuable-serde]
 -version = "0.1.0"
 -optional = true
--default_features = false
+-default-features = false
 -
 -[target."cfg(tracing_unstable)".dependencies.valuable_crate]
 -version = "0.1.0"
 -optional = true
--default_features = false
+-default-features = false
 -package = "valuable"
-+valuable = ["tracing-core/valuable"]
+ 
  [badges.maintenance]
  status = "experimental"
+@@ -81,3 +68,4 @@
+     "cfg(flaky_tests)",
+     "cfg(tracing_unstable)",
+ ]
++
diff --git a/tracing-serde-fix-metadata.diff b/tracing-serde-fix-metadata.diff
index 9ba8a32..8045722 100644
--- a/tracing-serde-fix-metadata.diff
+++ b/tracing-serde-fix-metadata.diff
@@ -1,10 +1,14 @@
---- tracing-serde-0.1.3/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ tracing-serde-0.1.3/Cargo.toml	2023-03-01T21:28:07.386841+00:00
-@@ -29,7 +29,5 @@
+--- tracing-serde-0.2.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ tracing-serde-0.2.0/Cargo.toml	2025-01-03T16:54:52.586700+00:00
+@@ -53,11 +53,6 @@
  [dev-dependencies.serde_json]
  version = "1"
  
 -[features]
--valuable = ["tracing-core/valuable"]
+-valuable = [
+-    "tracing-core/valuable",
+-]
+-
  [badges.maintenance]
  status = "experimental"
+