From 7fbefbd2da590b2184d62e9e9bf2559b920d2b31 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 9 Aug 2024 13:53:40 +0200 Subject: [PATCH] Update to version 0.24.1; Fixes RHBZ#2300011 --- .gitignore | 1 + addr2line-fix-metadata.diff | 18 +++++------------- rust-addr2line.spec | 4 +--- rust2rpm.toml | 4 ++++ sources | 2 +- 5 files changed, 12 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 8fe084a..b77e91a 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /addr2line-0.19.0.crate /addr2line-0.21.0.crate /addr2line-0.24.0.crate +/addr2line-0.24.1.crate diff --git a/addr2line-fix-metadata.diff b/addr2line-fix-metadata.diff index 09d74c6..d57535e 100644 --- a/addr2line-fix-metadata.diff +++ b/addr2line-fix-metadata.diff @@ -1,14 +1,6 @@ ---- addr2line-0.24.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ addr2line-0.24.0/Cargo.toml 2024-07-24T22:00:45.238984+00:00 -@@ -20,6 +20,7 @@ - ".github", - "*.sh", - "*.r", -+ "rustfmt.toml", - ] - description = "A cross-platform symbolication library written in Rust, using `gimli`" - documentation = "https://docs.rs/addr2line" -@@ -42,15 +43,6 @@ +--- addr2line-0.24.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ addr2line-0.24.1/Cargo.toml 2024-08-09T11:51:25.541442+00:00 +@@ -45,15 +45,6 @@ [profile.release] debug = 2 @@ -24,7 +16,7 @@ [[test]] name = "correctness" required-features = [ -@@ -66,11 +58,6 @@ +@@ -69,11 +60,6 @@ version = "1.0.0" optional = true package = "rustc-std-workspace-alloc" @@ -36,7 +28,7 @@ [dependencies.compiler_builtins] version = "0.1.2" -@@ -139,7 +126,6 @@ +@@ -142,7 +128,6 @@ "rustc-demangle", "cpp_demangle", "smallvec", diff --git a/rust-addr2line.spec b/rust-addr2line.spec index da55c68..03c4cab 100644 --- a/rust-addr2line.spec +++ b/rust-addr2line.spec @@ -9,7 +9,7 @@ %global crate addr2line Name: rust-addr2line -Version: 0.24.0 +Version: 0.24.1 Release: %autorelease Summary: Cross-platform symbolication library written in Rust, using gimli @@ -17,8 +17,6 @@ License: Apache-2.0 OR MIT URL: https://crates.io/crates/addr2line Source: %{crates_source} # Manually created patch for downstream crate metadata changes -# * exclude rustfmt.toml, only useful for upstream development -# https://github.com/gimli-rs/addr2line/pull/312 # * drop binary and test that requires bin # * drop clap dependency, only used by bin Patch: addr2line-fix-metadata.diff diff --git a/rust2rpm.toml b/rust2rpm.toml index 903c928..0a6e262 100644 --- a/rust2rpm.toml +++ b/rust2rpm.toml @@ -1,5 +1,9 @@ [package] cargo-install-bin = false +cargo-toml-patch-comments = [ + "drop binary and test that requires bin", + "drop clap dependency, only used by bin", +] [features] hide = [ diff --git a/sources b/sources index d52f53c..6e83d26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (addr2line-0.24.0.crate) = c23eec35359c3389ef18cd6134417b2afe4adce8b8938c3c53deed0eb4f84d3a2c958d6038895298596f8ed380203a1175e4650573ac61bf2e1b6669fa20789f +SHA512 (addr2line-0.24.1.crate) = ffa53fcfbbccdec943410083aa5f44e93122e0b40dc45acfe00b454a02c5575549e9a61807d87080d1677da807fef695b6676036fec3ca079d2b841794dbc0b5