.gitignore

@@ -17,6 +17,3 @@
 /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,31 +1,13 @@
---- addr2line-0.24.2/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ addr2line-0.24.2/Cargo.toml	2024-10-04T17:10:01.688661+00:00
-@@ -53,20 +53,10 @@
- name = "addr2line"
- path = "src/lib.rs"
- 
--[[bin]]
--name = "addr2line"
--path = "src/bin/addr2line.rs"
--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",
+--- addr2line-0.21.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ addr2line-0.21.0/Cargo.toml	2023-11-29T18:39:59.278241+00:00
+@@ -18,6 +18,10 @@
+     "/benches/*",
+     "/fixtures/*",
+     ".github",
++    "/bench.plot.r",
++    "/benchmark.sh",
++    "/coverage.sh",
++    "/rustfmt.toml",
  ]
- cargo-all = []
- default = [
+ description = "A cross-platform symbolication library written in Rust, using `gimli`"
+ documentation = "https://docs.rs/addr2line"

rust-addr2line.spec

@@ -1,15 +1,12 @@
-# Generated by rust2rpm 26
+# Generated by rust2rpm 25
 # * 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.24.2
+Version:        0.21.0
 Release:        %autorelease
 Summary:        Cross-platform symbolication library written in Rust, using gimli
 
@@ -17,11 +14,10 @@ License:        Apache-2.0 OR MIT
 URL:            https://crates.io/crates/addr2line
 Source:         %{crates_source}
 # Manually created patch for downstream crate metadata changes
-# * drop binary and test that requires bin
-# * drop clap dependency, only used by bin
+# * exclude files that are only useful for upstream development
 Patch:          addr2line-fix-metadata.diff
 
-BuildRequires:  cargo-rpm-macros >= 26
+BuildRequires:  cargo-rpm-macros >= 24
 
 %global _description %{expand:
 A cross-platform symbolication library written in Rust, using `gimli`.}
@@ -56,18 +52,6 @@ use the "default" feature of the "%{crate}" crate.
 %files       -n %{name}+default-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+cargo-all-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+cargo-all-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "cargo-all" feature of the "%{crate}" crate.
-
-%files       -n %{name}+cargo-all-devel
-%ghost %{crate_instdir}/Cargo.toml
-
 %package     -n %{name}+cpp_demangle-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -92,16 +76,28 @@ use the "fallible-iterator" feature of the "%{crate}" crate.
 %files       -n %{name}+fallible-iterator-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+loader-devel
+%package     -n %{name}+memmap2-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+loader-devel %{_description}
+%description -n %{name}+memmap2-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "loader" feature of the "%{crate}" crate.
+use the "memmap2" feature of the "%{crate}" crate.
 
-%files       -n %{name}+loader-devel
+%files       -n %{name}+memmap2-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+object-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+object-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "object" feature of the "%{crate}" crate.
+
+%files       -n %{name}+object-devel
 %ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+rustc-demangle-devel
@@ -140,11 +136,21 @@ 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,26 +1,11 @@
-[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.24.2.crate) = 39cbec3c920ffc0f37584afb55e1cfe4f182e4415319a4e9bfe842360f102f7b9315f6171c0cf71ba0337123903e604096cd573fe98698a26c8eebc2376d965b
+SHA512 (addr2line-0.21.0.crate) = afde7660dda30dee240e79df1fb5b92d4572520bf17a134ef3765e2a077af9e13713952d52e27fae420109b40f6e24dbce1056687dbcbead858ffc21cc7dc69b