Update to 0.8.0

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
6 years ago · db694f48ba
parent d32d4afeb6
commit db694f48ba
8 changed files with 74 additions and 64 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,4 @@
 /addr2line-0.5.0.crate
 /addr2line-0.6.0.crate
 /addr2line-0.7.0.crate
+/addr2line-0.8.0.crate
--- a/0001-Update-Object-lifetimes-for-0.11.patch
+++ b/0001-Update-Object-lifetimes-for-0.11.patch
@ -1,38 +0,0 @@
-From 017a2d92e40dd938a37c6bf08e01f9e98790fdac Mon Sep 17 00:00:00 2001
-From: Josh Stone <jistone@redhat.com>
-Date: Tue, 27 Nov 2018 12:01:51 -0800
-Subject: [PATCH] Update Object lifetimes for 0.11
-
---
- src/lib.rs | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/lib.rs b/src/lib.rs
-index eb9ead251cd3..24e2445f5921 100644
--- a/src/lib.rs
-+++ b/src/lib.rs
-@@ -121,16 +121,18 @@ impl Context<gimli::EndianRcSlice<gimli::RunTimeEndian>> {
-     ///
-     /// Performance sensitive applications may want to use `Context::from_sections`
-     /// with a more specialised `gimli::Reader` implementation.
-    pub fn new<'input, 'data, O: object::Object<'input, 'data>>(file: &O) -> Result<Self, Error> {
-+    pub fn new<'data, 'file, O: object::Object<'data, 'file>>(
-+        file: &'file O,
-+    ) -> Result<Self, Error> {
-         let endian = if file.is_little_endian() {
-             gimli::RunTimeEndian::Little
-         } else {
-             gimli::RunTimeEndian::Big
-         };
- 
-        fn load_section<'input, 'data, O, S, Endian>(file: &O, endian: Endian) -> S
-+        fn load_section<'data, 'file, O, S, Endian>(file: &'file O, endian: Endian) -> S
-         where
-            O: object::Object<'input, 'data>,
-+            O: object::Object<'data, 'file>,
-             S: gimli::Section<gimli::EndianRcSlice<Endian>>,
-             Endian: gimli::Endianity,
-         {
-- 
-2.19.1
-
--- a/addr2line-fix-metadata.diff
+++ b/addr2line-fix-metadata.diff
@ -1,11 +1,10 @@
--- addr2line-0.7.0/Cargo.toml	1969-12-31T16:00:00-08:00
-+++ addr2line-0.7.0/Cargo.toml	2018-11-27T10:42:42.057776-08:00
-@@ -51,7 +51,7 @@
- version = "1.0"
+--- addr2line-0.8.0/Cargo.toml	1970-01-01T01:00:00+01:00
+++ addr2line-0.8.0/Cargo.toml	2019-02-10T15:33:51.349701+01:00
+@@ -82,7 +82,6 @@
+ version = "0.3"
 
- [dependencies.object]
-version = "0.9"
-+version = "0.11"
- 
- [dependencies.rustc-demangle]
- version = "0.1"
+ [features]
+-alloc = ["gimli/alloc"]
+ default = ["rustc-demangle", "cpp_demangle", "object", "std"]
+ std = ["gimli/std", "intervaltree/std", "object/std", "smallvec/std"]
+ [badges.travis-ci]
--- a/rust-addr2line.spec
+++ b/rust-addr2line.spec
@ -7,36 +7,38 @@
 %global crate addr2line

 Name:           rust-%{crate}
-Version:        0.7.0
-Release:        5%{?dist}
+Version:        0.8.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
-Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
+Source:         %{crates_source}
 # Initial patched metadata
-# * bump object to 0.11
+# * Drop "alloc" feature, it is nightly-only
 Patch0:         addr2line-fix-metadata.diff
-# https://github.com/gimli-rs/addr2line/pull/107
-Patch1:         0001-Update-Object-lifetimes-for-0.11.patch

 ExclusiveArch:  %{rust_arches}

 BuildRequires:  rust-packaging
-BuildRequires:  (crate(cpp_demangle/default) >= 0.2.0 with crate(cpp_demangle/default) < 0.3.0)
-BuildRequires:  (crate(fallible-iterator/default) >= 0.1.0 with crate(fallible-iterator/default) < 0.2.0)
-BuildRequires:  (crate(gimli/default) >= 0.16.0 with crate(gimli/default) < 0.17.0)
-BuildRequires:  (crate(intervaltree/default) >= 0.2.0 with crate(intervaltree/default) < 0.3.0)
+BuildRequires:  (crate(cpp_demangle) >= 0.2.0 with crate(cpp_demangle) < 0.3.0)
+BuildRequires:  (crate(fallible-iterator) >= 0.1.0 with crate(fallible-iterator) < 0.2.0)
+BuildRequires:  (crate(gimli) >= 0.16.1 with crate(gimli) < 0.17.0)
+BuildRequires:  (crate(gimli/std) >= 0.16.1 with crate(gimli/std) < 0.17.0)
+BuildRequires:  (crate(intervaltree) >= 0.2.0 with crate(intervaltree) < 0.3.0)
+BuildRequires:  (crate(intervaltree/std) >= 0.2.0 with crate(intervaltree/std) < 0.3.0)
 BuildRequires:  (crate(lazycell/default) >= 1.0.0 with crate(lazycell/default) < 2.0.0)
-BuildRequires:  (crate(object/default) >= 0.11.0 with crate(object/default) < 0.12.0)
+BuildRequires:  (crate(object) >= 0.11.0 with crate(object) < 0.12.0)
+BuildRequires:  (crate(object/std) >= 0.11.0 with crate(object/std) < 0.12.0)
 BuildRequires:  (crate(rustc-demangle/default) >= 0.1.0 with crate(rustc-demangle/default) < 0.2.0)
-BuildRequires:  (crate(smallvec/default) >= 0.6.0 with crate(smallvec/default) < 0.7.0)
+BuildRequires:  (crate(smallvec) >= 0.6.0 with crate(smallvec) < 0.7.0)
+BuildRequires:  (crate(smallvec/std) >= 0.6.0 with crate(smallvec/std) < 0.7.0)
 %if %{with check}
-BuildRequires:  (crate(backtrace/default) >= 0.3.0 with crate(backtrace/default) < 0.4.0)
+BuildRequires:  (crate(backtrace/default) >= 0.3.13 with crate(backtrace/default) < 0.4.0)
 BuildRequires:  (crate(clap/default) >= 2.0.0 with crate(clap/default) < 3.0.0)
 BuildRequires:  (crate(findshlibs/default) >= 0.4.0 with crate(findshlibs/default) < 0.5.0)
-BuildRequires:  (crate(memmap/default) >= 0.6.0 with crate(memmap/default) < 0.7.0)
+BuildRequires:  (crate(memmap/default) >= 0.7.0 with crate(memmap/default) < 0.8.0)
 BuildRequires:  (crate(rustc-test/default) >= 0.3.0 with crate(rustc-test/default) < 0.4.0)
 %endif

@ -84,6 +86,18 @@ which use "cpp_demangle" feature of "%{crate}" crate.
 %files       -n %{name}+cpp_demangle-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-demangle-devel
 Summary:        %{summary}
 BuildArch:      noarch
@ -96,8 +110,20 @@ which use "rustc-demangle" feature of "%{crate}" crate.
 %files       -n %{name}+rustc-demangle-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
+
 %prep
-%autosetup -n %{crate}-%{version} -p1
+%autosetup -n %{crate}-%{version_no_tilde} -p1
 %cargo_prep

 %build
@ -112,6 +138,9 @@ which use "rustc-demangle" feature of "%{crate}" crate.
 %endif

 %changelog
+* Sun Feb 10 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.8.0-1
+- Update to 0.8.0
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (addr2line-0.7.0.crate) = a62e2235030fe8ba4e13962684da6d7d956bb31aedbb71103b932b830375a4dcb1f550b22d51f7992caa199e568e26aee961c130642b265d330a2c89abc30af5
+SHA512 (addr2line-0.8.0.crate) = 63857ab38cc2106b6d9f8a80d59202a40a7352ffa49b60ed8dd2d7abe427bea66dd8d123b105a7a45b41dd80ac9ec913b2d913db9e72f7b60453e80e4fee5b80
--- a/tests/.fmf/version
+++ b/tests/.fmf/version
@ -0,0 +1 @@
+1
--- a/tests/provision.fmf
+++ b/tests/provision.fmf
@ -0,0 +1,5 @@
+---
+standard-inventory-qcow2:
+  qemu:
+    # `cargo test` usually eats more than 1G.
+    m: 4G
--- a/tests/tests.yml
+++ b/tests/tests.yml
@ -0,0 +1,13 @@
+---
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+    - classic
+    repositories:
+    - repo: "https://src.fedoraproject.org/tests/rust.git"
+      dest: rust
+    tests:
+    - rust/cargo-test
+    environment:
+      pkg: rust-addr2line