From 8afa9b9e52f02ecf7bf44f5cbb90bf02c03fca26 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mar 10 2019 10:26:30 +0000 Subject: Do not pull optional dependencies Signed-off-by: Igor Gnatenko --- diff --git a/backtrace-fix-metadata.diff b/backtrace-fix-metadata.diff index 462d8d1..fc5b544 100644 --- a/backtrace-fix-metadata.diff +++ b/backtrace-fix-metadata.diff @@ -1,5 +1,5 @@ ---- backtrace-0.3.14/Cargo.toml 1969-12-31T16:00:00-08:00 -+++ backtrace-0.3.14/Cargo.toml 2019-02-19T09:35:27.921474-08:00 +--- backtrace-0.3.14/Cargo.toml 1970-01-01T01:00:00+01:00 ++++ backtrace-0.3.14/Cargo.toml 2019-03-10T11:25:48.303334+01:00 @@ -22,6 +22,7 @@ readme = "README.md" license = "MIT/Apache-2.0" @@ -8,40 +8,7 @@ [[example]] name = "backtrace" -@@ -42,9 +43,6 @@ - [[test]] - name = "smoke" - required-features = ["std"] --[dependencies.addr2line] --version = "0.7.0" --optional = true - - [dependencies.cfg-if] - version = "0.1.6" -@@ -53,22 +51,6 @@ - version = "0.2.3" - optional = true - default-features = false -- --[dependencies.findshlibs] --version = "0.4.0" --optional = true -- --[dependencies.gimli] --version = "0.16.0" --optional = true -- --[dependencies.memmap] --version = "0.7.0" --optional = true -- --[dependencies.object] --version = "0.9.0" --optional = true - - [dependencies.rustc-demangle] - version = "0.1.4" -@@ -88,12 +70,8 @@ +@@ -88,12 +89,9 @@ version = "0.1" [features] @@ -50,12 +17,12 @@ -default = ["std", "libunwind", "libbacktrace", "coresymbolication", "dladdr", "dbghelp"] +default = ["std", "libunwind", "libbacktrace", "dladdr"] dladdr = [] --gimli-symbolize = ["addr2line", "findshlibs", "gimli", "memmap", "object"] + gimli-symbolize = ["addr2line", "findshlibs", "gimli", "memmap", "object"] -kernel32 = [] libbacktrace = ["backtrace-sys", "std"] libunwind = [] serialize-rustc = ["rustc-serialize"] -@@ -106,6 +84,3 @@ +@@ -106,6 +104,3 @@ [target."cfg(any(unix, target_env = \"sgx\"))".dependencies.libc] version = "0.2.45" default-features = false diff --git a/rust-backtrace.spec b/rust-backtrace.spec index c421984..e817d7c 100644 --- a/rust-backtrace.spec +++ b/rust-backtrace.spec @@ -7,7 +7,7 @@ Name: rust-%{crate} Version: 0.3.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library to acquire a stack trace (backtrace) at runtime in a Rust program # Upstream license specification: MIT/Apache-2.0 @@ -16,7 +16,6 @@ URL: https://crates.io/crates/backtrace Source: %{crates_source} # Initial patched metadata # * No windows/osx -# * No gimli-symbolize feature until findshlibs is packaged # * Exclude CI files, https://github.com/alexcrichton/backtrace-rs/pull/131 Patch0: backtrace-fix-metadata.diff @@ -26,12 +25,8 @@ BuildRequires: rust-packaging BuildRequires: (crate(autocfg/default) >= 0.1.0 with crate(autocfg/default) < 0.2.0) BuildRequires: (crate(backtrace-sys/default) >= 0.1.17 with crate(backtrace-sys/default) < 0.2.0) BuildRequires: (crate(cfg-if/default) >= 0.1.6 with crate(cfg-if/default) < 0.2.0) -BuildRequires: (crate(cpp_demangle) >= 0.2.3 with crate(cpp_demangle) < 0.3.0) BuildRequires: (crate(libc) >= 0.2.45 with crate(libc) < 0.3.0) BuildRequires: (crate(rustc-demangle/default) >= 0.1.4 with crate(rustc-demangle/default) < 0.2.0) -BuildRequires: (crate(rustc-serialize/default) >= 0.3.0 with crate(rustc-serialize/default) < 0.4.0) -BuildRequires: (crate(serde/default) >= 1.0.0 with crate(serde/default) < 2.0.0) -BuildRequires: (crate(serde_derive/default) >= 1.0.0 with crate(serde_derive/default) < 2.0.0) %global _description \ A library to acquire a stack trace (backtrace) at runtime in a Rust program. @@ -64,6 +59,18 @@ which use "default" feature of "%{crate}" crate. %files -n %{name}+default-devel %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%package -n %{name}+addr2line-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+addr2line-devel %{_description} + +This package contains library source intended for building other packages +which use "addr2line" feature of "%{crate}" crate. + +%files -n %{name}+addr2line-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + %package -n %{name}+backtrace-sys-devel Summary: %{summary} BuildArch: noarch @@ -100,6 +107,42 @@ which use "dladdr" feature of "%{crate}" crate. %files -n %{name}+dladdr-devel %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%package -n %{name}+findshlibs-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+findshlibs-devel %{_description} + +This package contains library source intended for building other packages +which use "findshlibs" feature of "%{crate}" crate. + +%files -n %{name}+findshlibs-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+gimli-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+gimli-devel %{_description} + +This package contains library source intended for building other packages +which use "gimli" feature of "%{crate}" crate. + +%files -n %{name}+gimli-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+gimli-symbolize-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+gimli-symbolize-devel %{_description} + +This package contains library source intended for building other packages +which use "gimli-symbolize" feature of "%{crate}" crate. + +%files -n %{name}+gimli-symbolize-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + %package -n %{name}+libbacktrace-devel Summary: %{summary} BuildArch: noarch @@ -124,6 +167,30 @@ which use "libunwind" feature of "%{crate}" crate. %files -n %{name}+libunwind-devel %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%package -n %{name}+memmap-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+memmap-devel %{_description} + +This package contains library source intended for building other packages +which use "memmap" feature of "%{crate}" crate. + +%files -n %{name}+memmap-devel +%ghost %{cargo_registry}/%{crate}-%{version}/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 "object" feature of "%{crate}" crate. + +%files -n %{name}+object-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + %package -n %{name}+rustc-serialize-devel Summary: %{summary} BuildArch: noarch @@ -225,6 +292,9 @@ which use "unix-backtrace" feature of "%{crate}" crate. %endif %changelog +* Sun Mar 10 2019 Igor Gnatenko - 0.3.14-2 +- Do not pull optional dependencies + * Tue Feb 19 2019 Josh Stone - 0.3.14-1 - Update to 0.3.14