Update to version 0.24.2; Fixes RHBZ#2316436

Signed-off-by: Michel Lind <salimma@fedoraproject.org>

.gitignore

@@ -17,3 +17,6 @@
 /addr2line-0.18.0.crate
 /addr2line-0.19.0.crate
 /addr2line-0.21.0.crate
+/addr2line-0.24.0.crate
+/addr2line-0.24.1.crate
+/addr2line-0.24.2.crate

addr2line-fix-metadata.diff

@@ -1,13 +1,31 @@
---- addr2line-0.21.0/Cargo.toml	1970-01-01T00:00:01+00:00
+--- addr2line-0.24.2/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ addr2line-0.21.0/Cargo.toml	2023-11-29T18:39:59.278241+00:00
++++ addr2line-0.24.2/Cargo.toml	2024-10-04T17:10:01.688661+00:00
-@@ -18,6 +18,10 @@
+@@ -53,20 +53,10 @@
-     "/benches/*",
+ name = "addr2line"
-     "/fixtures/*",
+ path = "src/lib.rs"
-     ".github",
+ 
-+    "/bench.plot.r",
+-[[bin]]
-+    "/benchmark.sh",
+-name = "addr2line"
-+    "/coverage.sh",
+-path = "src/bin/addr2line.rs"
-+    "/rustfmt.toml",
+-required-features = ["bin"]
+-
+ [dependencies.alloc]
+ version = "1.0.0"
+ optional = true
+ package = "rustc-std-workspace-alloc"
+-
+-[dependencies.clap]
+-version = "4.3.21"
+-features = ["wrap_help"]
+-optional = true
+ 
+ [dependencies.compiler_builtins]
+ version = "0.1.2"
+@@ -136,7 +126,6 @@
+     "cpp_demangle",
+     "fallible-iterator",
+     "smallvec",
+-    "dep:clap",
  ]
- description = "A cross-platform symbolication library written in Rust, using `gimli`"
+ cargo-all = []
- documentation = "https://docs.rs/addr2line"
+ default = [

rust-addr2line.spec

@@ -1,12 +1,15 @@
-# Generated by rust2rpm 25
+# Generated by rust2rpm 26
 # * resolve circular dependency with backtrace
 %bcond_with check
 %global debug_package %{nil}
 
+# prevent executables from being installed
+%global cargo_install_bin 0
+
 %global crate addr2line
 
 Name:           rust-addr2line
-Version:        0.21.0
+Version:        0.24.2
 Release:        %autorelease
 Summary:        Cross-platform symbolication library written in Rust, using gimli
 
@@ -14,10 +17,11 @@ License:        Apache-2.0 OR MIT
 URL:            https://crates.io/crates/addr2line
 Source:         %{crates_source}
 # Manually created patch for downstream crate metadata changes
-# * exclude files that are only useful for upstream development
+# * drop binary and test that requires bin
+# * drop clap dependency, only used by bin
 Patch:          addr2line-fix-metadata.diff
 
-BuildRequires:  cargo-rpm-macros >= 24
+BuildRequires:  cargo-rpm-macros >= 26
 
 %global _description %{expand:
 A cross-platform symbolication library written in Rust, using `gimli`.}
@@ -52,52 +56,52 @@ use the "default" feature of the "%{crate}" crate.
 %files       -n %{name}+default-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+cpp_demangle-devel
+%package     -n %{name}+cargo-all-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+cpp_demangle-devel %{_description}
+%description -n %{name}+cargo-all-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "cpp_demangle" feature of the "%{crate}" crate.
+use the "cargo-all" feature of the "%{crate}" crate.
 
-%files       -n %{name}+cpp_demangle-devel
+%files       -n %{name}+cargo-all-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+fallible-iterator-devel
+%package     -n %{name}+cpp_demangle-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+fallible-iterator-devel %{_description}
+%description -n %{name}+cpp_demangle-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "fallible-iterator" feature of the "%{crate}" crate.
+use the "cpp_demangle" feature of the "%{crate}" crate.
 
-%files       -n %{name}+fallible-iterator-devel
+%files       -n %{name}+cpp_demangle-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+memmap2-devel
+%package     -n %{name}+fallible-iterator-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+memmap2-devel %{_description}
+%description -n %{name}+fallible-iterator-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "memmap2" feature of the "%{crate}" crate.
+use the "fallible-iterator" feature of the "%{crate}" crate.
 
-%files       -n %{name}+memmap2-devel
+%files       -n %{name}+fallible-iterator-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+object-devel
+%package     -n %{name}+loader-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+object-devel %{_description}
+%description -n %{name}+loader-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "object" feature of the "%{crate}" crate.
+use the "loader" feature of the "%{crate}" crate.
 
-%files       -n %{name}+object-devel
+%files       -n %{name}+loader-devel
 %ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+rustc-demangle-devel
@@ -136,21 +140,11 @@ use the "std" feature of the "%{crate}" crate.
 %files       -n %{name}+std-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+std-object-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+std-object-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "std-object" feature of the "%{crate}" crate.
-
-%files       -n %{name}+std-object-devel
-%ghost %{crate_instdir}/Cargo.toml
-
 %prep
 %autosetup -n %{crate}-%{version} -p1
 %cargo_prep
+# remove source code for the binary we're not shipping
+rm src/bin/addr2line.rs
 
 %generate_buildrequires
 %cargo_generate_buildrequires

rust2rpm.toml

@@ -1,11 +1,26 @@
+[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 = [
+    "all", # only contains bin
     "alloc",
+    "bin", # only needed by the binary which we don't ship
     "compiler_builtins",
     "core",
     "rustc-dep-of-std",
 ]
 
+[scripts]
+prep.post = [
+  "# remove source code for the binary we're not shipping",
+  "rm src/bin/addr2line.rs",
+]
+
 [tests]
 run = ["none"]
 comments = ["resolve circular dependency with backtrace"]

sources

@@ -1 +1 @@
-SHA512 (addr2line-0.21.0.crate) = afde7660dda30dee240e79df1fb5b92d4572520bf17a134ef3765e2a077af9e13713952d52e27fae420109b40f6e24dbce1056687dbcbead858ffc21cc7dc69b
+SHA512 (addr2line-0.24.2.crate) = 39cbec3c920ffc0f37584afb55e1cfe4f182e4415319a4e9bfe842360f102f7b9315f6171c0cf71ba0337123903e604096cd573fe98698a26c8eebc2376d965b