From 711e5b16b82e7157cd1b484c2d058dd5b3a6bc60 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: May 12 2020 19:03:42 +0000 Subject: Update to 0.12.0 --- diff --git a/.gitignore b/.gitignore index fdf3a06..deeb868 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /addr2line-0.9.0.crate /addr2line-0.10.0.crate /addr2line-0.11.0.crate +/addr2line-0.12.0.crate diff --git a/0001-Update-object.patch b/0001-Update-object.patch deleted file mode 100644 index 297a822..0000000 --- a/0001-Update-object.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 203fe1e00d5d751763e0aaec75f4abe670271b81 Mon Sep 17 00:00:00 2001 -From: bjorn3 -Date: Thu, 30 Apr 2020 12:16:46 +0200 -Subject: [PATCH] Update object - ---- - src/lib.rs | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/lib.rs b/src/lib.rs -index c72dffbd036b..0173a26418bc 100644 ---- a/src/lib.rs -+++ b/src/lib.rs -@@ -99,9 +99,12 @@ impl Context> { - S: gimli::Section>, - Endian: gimli::Endianity, - { -+ use object::ObjectSection; -+ - let data = file -- .section_data_by_name(S::section_name()) -- .unwrap_or(Cow::Borrowed(&[])); -+ .section_by_name(S::section_name()) -+ .and_then(|section| section.data().ok()) -+ .unwrap_or(&[]); - S::from(gimli::EndianRcSlice::new(Rc::from(&*data), endian)) - } - --- -2.26.2 - diff --git a/addr2line-fix-metadata.diff b/addr2line-fix-metadata.diff deleted file mode 100644 index bb66b37..0000000 --- a/addr2line-fix-metadata.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- addr2line-0.11.0/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ addr2line-0.11.0/Cargo.toml 2020-05-05T21:44:40.646878+00:00 -@@ -63,7 +63,7 @@ - version = "1" - - [dependencies.object] --version = "0.17" -+version = "0.18" - features = ["read"] - optional = true - default-features = false diff --git a/rust-addr2line.spec b/rust-addr2line.spec index 98c6ddf..d7a4569 100644 --- a/rust-addr2line.spec +++ b/rust-addr2line.spec @@ -5,18 +5,14 @@ %global crate addr2line Name: rust-%{crate} -Version: 0.11.0 -Release: 2%{?dist} +Version: 0.12.0 +Release: 1%{?dist} Summary: Cross-platform symbolication library written in Rust, using `gimli` # Upstream license specification: Apache-2.0/MIT License: ASL 2.0 or MIT URL: https://crates.io/crates/addr2line Source: %{crates_source} -# Initial patched metadata -# * Bump to object 0.18, https://github.com/gimli-rs/addr2line/pull/159/commits/203fe1e00d5d751763e0aaec75f4abe670271b81 -Patch0: addr2line-fix-metadata.diff -Patch1: 0001-Update-object.patch ExclusiveArch: %{rust_arches} %if %{__cargo_skip_build} @@ -69,6 +65,18 @@ which use "cpp_demangle" feature of "%{crate}" crate. %files -n %{name}+cpp_demangle-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%package -n %{name}+fallible-iterator-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+fallible-iterator-devel %{_description} + +This package contains library source intended for building other packages +which use "fallible-iterator" feature of "%{crate}" crate. + +%files -n %{name}+fallible-iterator-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + %package -n %{name}+object-devel Summary: %{summary} BuildArch: noarch @@ -93,6 +101,18 @@ which use "rustc-demangle" feature of "%{crate}" crate. %files -n %{name}+rustc-demangle-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%package -n %{name}+smallvec-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+smallvec-devel %{_description} + +This package contains library source intended for building other packages +which use "smallvec" feature of "%{crate}" crate. + +%files -n %{name}+smallvec-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + %package -n %{name}+std-devel Summary: %{summary} BuildArch: noarch @@ -136,6 +156,9 @@ which use "std-object" feature of "%{crate}" crate. %endif %changelog +* Tue May 12 2020 Josh Stone - 0.12.0-1 +- Update to 0.12.0 + * Tue May 05 2020 Josh Stone - 0.11.0-2 - Bump to object 0.18 diff --git a/sources b/sources index 18021a4..e21f0d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (addr2line-0.11.0.crate) = 7f4ddbcdb115c483fd012fc0f6229c99e542d9c25e2985ba1b093ff706b5f25d0ed8da994144c28a8fe2bc3337362d39b62bdcfd1ebe3275ebb80f2e4c3e8434 +SHA512 (addr2line-0.12.0.crate) = aebc4c2c3c87a6fb5e076264dd7abc72fd639a0c1eee0c538a7fcccb3fb97e9f1f0f5c9bbc40678870a1054efa902d7c9e00deada4e4c3293e04476ad3dfe018