From 760cad7fb4eb3d70d14eeab6cdb7bc105421dcea Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Dec 12 2018 21:44:37 +0000 Subject: Update to 0.3.12 --- diff --git a/.gitignore b/.gitignore index 06e002b..6fb9049 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /backtrace-0.3.7.crate /backtrace-0.3.8.crate /backtrace-0.3.9.crate +/backtrace-0.3.12.crate diff --git a/backtrace-fix-metadata.diff b/backtrace-fix-metadata.diff index f05e5ea..311ec80 100644 --- a/backtrace-fix-metadata.diff +++ b/backtrace-fix-metadata.diff @@ -1,59 +1,64 @@ ---- backtrace-0.3.9/Cargo.toml 1970-01-01T01:00:00+01:00 -+++ backtrace-0.3.9/Cargo.toml 2018-11-02T19:43:45.206434+01:00 -@@ -20,10 +20,7 @@ +--- backtrace-0.3.12/Cargo.toml 1969-12-31T16:00:00-08:00 ++++ backtrace-0.3.12/Cargo.toml 2018-12-12T13:38:50.557019-08:00 +@@ -22,6 +22,7 @@ readme = "README.md" license = "MIT/Apache-2.0" repository = "https://github.com/alexcrichton/backtrace-rs" ++exclude = ["/ci/*", "/.travis.yml", "/appveyor.yml"] + + [[example]] + name = "backtrace" +@@ -42,9 +43,6 @@ + [[test]] + name = "smoke" + required-features = ["std"] -[dependencies.addr2line] --version = "0.6.0" +-version = "0.7.0" -optional = true -- -+exclude = ["/ci/*", "/.travis.yml", "/appveyor.yml"] + [dependencies.cfg-if] version = "0.1" - -@@ -31,22 +28,6 @@ +@@ -53,22 +51,6 @@ version = "0.2.3" optional = true default-features = false - -[dependencies.findshlibs] --version = "0.3.3" +-version = "0.4.0" -optional = true - -[dependencies.gimli] --version = "0.15.0" +-version = "0.16.0" -optional = true - -[dependencies.memmap] --version = "0.6.2" +-version = "0.7.0" -optional = true - -[dependencies.object] --version = "0.7.0" +-version = "0.9.0" -optional = true [dependencies.rustc-demangle] version = "0.1.4" -@@ -64,12 +45,8 @@ +@@ -86,12 +68,8 @@ optional = true [features] -coresymbolication = [] --dbghelp = ["winapi"] --default = ["libunwind", "libbacktrace", "coresymbolication", "dladdr", "dbghelp"] -+default = ["libunwind", "libbacktrace", "dladdr"] +-dbghelp = [] +-default = ["std", "libunwind", "libbacktrace", "coresymbolication", "dladdr", "dbghelp"] ++default = ["std", "libunwind", "libbacktrace", "dladdr"] dladdr = [] -gimli-symbolize = ["addr2line", "findshlibs", "gimli", "memmap", "object"] -kernel32 = [] - libbacktrace = ["backtrace-sys"] + libbacktrace = ["backtrace-sys", "std"] libunwind = [] serialize-rustc = ["rustc-serialize"] -@@ -80,7 +57,3 @@ - optional = true +@@ -104,6 +82,3 @@ [target."cfg(unix)".dependencies.libc] - version = "0.2" + version = "0.2.45" + default-features = false -[target."cfg(windows)".dependencies.winapi] -version = "0.3.3" --features = ["std", "dbghelp", "processthreadsapi", "winnt", "minwindef"] --optional = true +-features = ["dbghelp", "processthreadsapi", "winnt", "minwindef"] diff --git a/rust-backtrace.spec b/rust-backtrace.spec index 2dab7c3..b07a7d1 100644 --- a/rust-backtrace.spec +++ b/rust-backtrace.spec @@ -5,8 +5,8 @@ %global crate backtrace Name: rust-%{crate} -Version: 0.3.9 -Release: 3%{?dist} +Version: 0.3.12 +Release: 1%{?dist} Summary: Library to acquire a stack trace (backtrace) at runtime in a Rust program # Upstream license specification: MIT/Apache-2.0 @@ -15,7 +15,7 @@ URL: https://crates.io/crates/backtrace Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate # Initial patched metadata # * No windows/osx -# * No addr2line due to backtrace(opt) -> addr2line -> error-chain(opt) -> backtrace +# * No gimli-symbolize feature until findshlibs is packaged # * Exclude CI files, https://github.com/alexcrichton/backtrace-rs/pull/131 Patch0: backtrace-fix-metadata.diff @@ -182,6 +182,18 @@ which use "serialize-serde" feature of "%{crate}" crate. %files -n %{name}+serialize-serde-devel %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%package -n %{name}+std-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+std-devel %{_description} + +This package contains library source intended for building other packages +which use "std" feature of "%{crate}" crate. + +%files -n %{name}+std-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + %package -n %{name}+unix-backtrace-devel Summary: %{summary} BuildArch: noarch @@ -211,6 +223,9 @@ which use "unix-backtrace" feature of "%{crate}" crate. %endif %changelog +* Wed Dec 12 2018 Josh Stone - 0.3.12-1 +- Update to 0.3.12 + * Fri Nov 02 2018 Igor Gnatenko - 0.3.9-3 - Adapt to new packaging diff --git a/sources b/sources index 89e68e3..5a3a800 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (backtrace-0.3.9.crate) = edb485ad27d19e0cccea123cc6a9db5b3222831e48722d8fcec7349fd1c4b62b67ab1f488fea4973da82c8f17a86aeba4ea8f2fc1aa60f6528833cda39efa637 +SHA512 (backtrace-0.3.12.crate) = 40e5aa214691f9c3ea5a609b96ea364d72b7a1596c42f74777ac5906cddf0207f591922ffeb53ffcd62e47d3f296daea0c93b469ee3426cf34866397dc40f47a