From d5453ddb321818222cab0558b4602402fdb185bf Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 9 Aug 2022 11:57:57 +0200 Subject: [PATCH] Update to version 0.18.0; Fixes RHBZ#2107880 --- .gitignore | 1 + addr2line-fix-metadata.diff | 13 +++++++++++ rust-addr2line.spec | 39 ++++++++++++++++++--------------- .rust2rpm.conf => rust2rpm.conf | 0 sources | 2 +- 5 files changed, 36 insertions(+), 19 deletions(-) create mode 100644 addr2line-fix-metadata.diff rename .rust2rpm.conf => rust2rpm.conf (100%) diff --git a/.gitignore b/.gitignore index e80cca7..e3b3276 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /addr2line-0.15.1.crate /addr2line-0.16.0.crate /addr2line-0.17.0.crate +/addr2line-0.18.0.crate diff --git a/addr2line-fix-metadata.diff b/addr2line-fix-metadata.diff new file mode 100644 index 0000000..31350f6 --- /dev/null +++ b/addr2line-fix-metadata.diff @@ -0,0 +1,13 @@ +--- addr2line-0.18.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ addr2line-0.18.0/Cargo.toml 2022-08-09T09:50:43.690333+00:00 +@@ -16,6 +16,10 @@ + "/benches/*", + "/fixtures/*", + ".github", ++ "/bench.plot.r", ++ "/benchmark.sh", ++ "/coverage.sh", ++ "/rustfmt.toml", + ] + description = "A cross-platform symbolication library written in Rust, using `gimli`" + documentation = "https://docs.rs/addr2line" diff --git a/rust-addr2line.spec b/rust-addr2line.spec index ebd962f..26c9945 100644 --- a/rust-addr2line.spec +++ b/rust-addr2line.spec @@ -1,23 +1,25 @@ -# Generated by rust2rpm 20 +# Generated by rust2rpm 22 # * resolve circular dependency with backtrace %bcond_with check %global debug_package %{nil} %global crate addr2line -Name: rust-%{crate} -Version: 0.17.0 +Name: rust-addr2line +Version: 0.18.0 Release: %autorelease Summary: Cross-platform symbolication library based on gimli -# Upstream license specification: Apache-2.0 OR MIT -License: ASL 2.0 or MIT +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 +Patch: addr2line-fix-metadata.diff ExclusiveArch: %{rust_arches} -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Cross-platform symbolication library written in Rust, using `gimli`.} @@ -34,10 +36,11 @@ This package contains library source intended for building other packages which use the "%{crate}" crate. %files devel -%license LICENSE-APACHE LICENSE-MIT -%doc CHANGELOG.md README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ -%exclude %{cargo_registry}/%{crate}-%{version_no_tilde}/{bench.plot.r,benchmark.sh,coverage,rustfmt.toml} +%license %{crate_instdir}/LICENSE-APACHE +%license %{crate_instdir}/LICENSE-MIT +%doc %{crate_instdir}/CHANGELOG.md +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -49,7 +52,7 @@ This package contains library source intended for building other packages which use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+cpp_demangle-devel Summary: %{summary} @@ -61,7 +64,7 @@ This package contains library source intended for building other packages which use the "cpp_demangle" feature of the "%{crate}" crate. %files -n %{name}+cpp_demangle-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+fallible-iterator-devel Summary: %{summary} @@ -73,7 +76,7 @@ This package contains library source intended for building other packages which use the "fallible-iterator" feature of the "%{crate}" crate. %files -n %{name}+fallible-iterator-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+object-devel Summary: %{summary} @@ -85,7 +88,7 @@ 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 %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+rustc-demangle-devel Summary: %{summary} @@ -97,7 +100,7 @@ This package contains library source intended for building other packages which use the "rustc-demangle" feature of the "%{crate}" crate. %files -n %{name}+rustc-demangle-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+smallvec-devel Summary: %{summary} @@ -109,7 +112,7 @@ This package contains library source intended for building other packages which use the "smallvec" feature of the "%{crate}" crate. %files -n %{name}+smallvec-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+std-devel Summary: %{summary} @@ -121,7 +124,7 @@ This package contains library source intended for building other packages which use the "std" feature of the "%{crate}" crate. %files -n %{name}+std-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+std-object-devel Summary: %{summary} @@ -133,7 +136,7 @@ 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 %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 diff --git a/.rust2rpm.conf b/rust2rpm.conf similarity index 100% rename from .rust2rpm.conf rename to rust2rpm.conf diff --git a/sources b/sources index 3bb992c..355c8b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (addr2line-0.17.0.crate) = ef3bbd7c6d1dfdd0b47e3be1fb4c8b15ed61a769bed7e80dce80461a1ee13ef21c75e62e9a66328504f862341f1e808abec5790ac79784e18655afcc16206b95 +SHA512 (addr2line-0.18.0.crate) = 6948d768e86151c436e49b42485c0cda6ae2e1b832b14bf4327b2839758c5c592b432dc08bebd97591d744a419ae7da132cfa1e2becf8a98778534ed05d73b3c