From db626ecfe05d2663f84007741b6de9554ec3d3ac Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Wed, 29 Nov 2023 21:52:21 +0100
Subject: [PATCH] Update to version 0.3.69; Fixes RHBZ#2218705

---
 .gitignore                       |  1 +
 backtrace-fix-metadata-auto.diff | 11 ++++++++---
 backtrace-fix-metadata.diff      | 14 +++-----------
 rust-backtrace.spec              | 13 ++++++-------
 rust2rpm.conf                    |  9 ---------
 rust2rpm.toml                    | 14 ++++++++++++++
 sources                          |  2 +-
 7 files changed, 33 insertions(+), 31 deletions(-)
 delete mode 100644 rust2rpm.conf
 create mode 100644 rust2rpm.toml

diff --git a/.gitignore b/.gitignore
index ef09a0a..9b0977a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@
 /backtrace-0.3.64.crate
 /backtrace-0.3.66.crate
 /backtrace-0.3.67.crate
+/backtrace-0.3.69.crate
diff --git a/backtrace-fix-metadata-auto.diff b/backtrace-fix-metadata-auto.diff
index 31cdcee..bb8a82a 100644
--- a/backtrace-fix-metadata-auto.diff
+++ b/backtrace-fix-metadata-auto.diff
@@ -1,6 +1,6 @@
---- backtrace-0.3.67/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ backtrace-0.3.67/Cargo.toml	2023-03-30T21:35:36.293509+00:00
-@@ -127,18 +127,5 @@
+--- backtrace-0.3.69/Cargo.toml	1970-01-01T00:00:01+00:00
++++ backtrace-0.3.69/Cargo.toml	2023-11-29T18:35:10.063960+00:00
+@@ -104,16 +104,6 @@
  std = []
  unix-backtrace = []
  verify-winapi = [
@@ -16,6 +16,11 @@
 -    "winapi/winnt",
  ]
  
+ [target."cfg(not(all(windows, target_env = \"msvc\", not(target_vendor = \"uwp\"))))".dependencies.addr2line]
+@@ -140,6 +130,3 @@
+ ]
+ default-features = false
+ 
 -[target."cfg(windows)".dependencies.winapi]
 -version = "0.3.9"
 -optional = true
diff --git a/backtrace-fix-metadata.diff b/backtrace-fix-metadata.diff
index b633fd9..558ea76 100644
--- a/backtrace-fix-metadata.diff
+++ b/backtrace-fix-metadata.diff
@@ -1,14 +1,6 @@
---- backtrace-0.3.67/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ backtrace-0.3.67/Cargo.toml	2023-03-30T21:36:01.225600+00:00
-@@ -25,6 +25,7 @@
- readme = "README.md"
- license = "MIT OR Apache-2.0"
- repository = "https://github.com/rust-lang/backtrace-rs"
-+exclude = ["/ci/"]
- 
- [[example]]
- name = "backtrace"
-@@ -48,17 +49,7 @@
+--- backtrace-0.3.69/Cargo.toml	1970-01-01T00:00:01+00:00
++++ backtrace-0.3.69/Cargo.toml	2023-11-29T18:35:41.541100+00:00
+@@ -49,17 +49,7 @@
  edition = "2018"
  
  [[test]]
diff --git a/rust-backtrace.spec b/rust-backtrace.spec
index 6cbad10..404e4bc 100644
--- a/rust-backtrace.spec
+++ b/rust-backtrace.spec
@@ -1,26 +1,25 @@
-# Generated by rust2rpm 24
+# Generated by rust2rpm 25
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate backtrace
 
 Name:           rust-backtrace
-Version:        0.3.67
+Version:        0.3.69
 Release:        %autorelease
 Summary:        Library to acquire a stack trace (backtrace) at runtime in a Rust program
 
 License:        MIT OR Apache-2.0
 URL:            https://crates.io/crates/backtrace
 Source:         %{crates_source}
-# Automatically generated patch to strip foreign dependencies
+# Automatically generated patch to strip dependencies and normalize metadata
 Patch:          backtrace-fix-metadata-auto.diff
 # Manually created patch for downstream crate metadata changes
 # * drop "accuracy" test (requires crates to be built in dylib mode)
 # * drop "current-exe-mismatch" test (fails on i686 for unknown reasons)
-# * exclude files for upstream CI
 Patch:          backtrace-fix-metadata.diff
 
-BuildRequires:  rust-packaging >= 21
+BuildRequires:  cargo-rpm-macros >= 24
 
 %global _description %{expand:
 A library to acquire a stack trace (backtrace) at runtime in a Rust
@@ -152,12 +151,12 @@ use the "std" 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
 # drop "accuracy" test (requires crates to be built in dylib mode)
 # drop "current-exe-mismatch" test (fails on i686 for unknown reasons)
 rm -r tests/accuracy/
 rm tests/current-exe-mismatch.rs
-%cargo_prep
 
 %generate_buildrequires
 %cargo_generate_buildrequires
diff --git a/rust2rpm.conf b/rust2rpm.conf
deleted file mode 100644
index aede82b..0000000
--- a/rust2rpm.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[DEFAULT]
-unwanted-features =
-  coresymbolication
-  dbghelp
-  dladdr
-  kernel32
-  libunwind
-  unix-backtrace
-  verify-winapi
diff --git a/rust2rpm.toml b/rust2rpm.toml
new file mode 100644
index 0000000..64e05a9
--- /dev/null
+++ b/rust2rpm.toml
@@ -0,0 +1,14 @@
+[package]
+summary = "Library to acquire a stack trace (backtrace) at runtime in a Rust program"
+
+[features]
+hide = [
+    "coresymbolication",
+    "dbghelp",
+    "dladdr",
+    "kernel32",
+    "libunwind",
+    "unix-backtrace",
+    "verify-winapi",
+]
+
diff --git a/sources b/sources
index 3454d56..2384aeb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (backtrace-0.3.67.crate) = 8603a3b63f4f08be315176908134243680bf1a4b0e6cb26ed81f5fc1060279126ca0ef28f209a10289e1a85214b35db6b496affd71ad21524094f3ee3acd31b6
+SHA512 (backtrace-0.3.69.crate) = 6e86de53e1c5003ef68b6a85479cde1e70bf416bdc50e6e32ead9f9f070fa30ad46de22574041c844ddfeabd5d15de01ef746f19f8cb7f257c491ef0bf071244