From f2754396b887f2cada3ec22b0b4bd39f75d5919f Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 1 Jan 2018 14:51:57 +0100 Subject: [PATCH] Update to 0.0.13 Signed-off-by: Igor Gnatenko --- .gitignore | 1 + ...e-directory-if-debug-is-missing.-fix.patch | 31 ------------------- rust-goblin.spec | 22 ++++++++----- sources | 2 +- 4 files changed, 16 insertions(+), 40 deletions(-) delete mode 100644 0001-tests-use-release-directory-if-debug-is-missing.-fix.patch diff --git a/.gitignore b/.gitignore index 57b5336..30225f3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /goblin-0.0.12.crate +/goblin-0.0.13.crate diff --git a/0001-tests-use-release-directory-if-debug-is-missing.-fix.patch b/0001-tests-use-release-directory-if-debug-is-missing.-fix.patch deleted file mode 100644 index 2af33b9..0000000 --- a/0001-tests-use-release-directory-if-debug-is-missing.-fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 7ba903ad760e27737807221e528380e474bc5b55 Mon Sep 17 00:00:00 2001 -From: m4b -Date: Sun, 3 Dec 2017 21:02:15 -0800 -Subject: [PATCH] tests: use release directory if debug is missing. fixes #63 - ---- - tests/archive.rs | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/tests/archive.rs b/tests/archive.rs -index c61b42c..144d0ae 100644 ---- a/tests/archive.rs -+++ b/tests/archive.rs -@@ -54,8 +54,13 @@ fn parse_archive() { - - #[test] - fn parse_self() { -+ use std::fs; - use std::io::Read; -- let path = Path::new("target").join("debug").join("libgoblin.rlib"); -+ let mut path = Path::new("target").join("debug").join("libgoblin.rlib"); -+ // https://github.com/m4b/goblin/issues/63 -+ if !fs::metadata(&path).is_ok() { -+ path = Path::new("target").join("release").join("libgoblin.rlib"); -+ } - let buffer = { - let mut fd = File::open(path).expect("open file"); - let mut v = Vec::new(); --- -2.15.1 - diff --git a/rust-goblin.spec b/rust-goblin.spec index 6b95b33..5e61794 100644 --- a/rust-goblin.spec +++ b/rust-goblin.spec @@ -5,24 +5,21 @@ %global crate goblin Name: rust-%{crate} -Version: 0.0.12 -Release: 2%{?dist} +Version: 0.0.13 +Release: 1%{?dist} Summary: Impish, cross-platform binary parsing and loading crate License: MIT URL: https://crates.io/crates/goblin Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate -# https://github.com/m4b/goblin/commit/7ba903ad760e27737807221e528380e474bc5b55 -Patch0: 0001-tests-use-release-directory-if-debug-is-missing.-fix.patch ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging # [dependencies] BuildRequires: (crate(log) >= 0.3.8 with crate(log) < 0.4.0) -BuildRequires: (crate(plain) >= 0.2.1 with crate(plain) < 0.3.0) -BuildRequires: (crate(scroll) >= 0.7.0 with crate(scroll) < 0.8.0) -BuildRequires: (crate(scroll_derive) >= 0.8.0 with crate(scroll_derive) < 0.9.0) +BuildRequires: (crate(plain) >= 0.2.3 with crate(plain) < 0.3.0) +BuildRequires: (crate(scroll) >= 0.8.0 with crate(scroll) < 0.9.0) %if %{with check} # [dev-dependencies] BuildRequires: (crate(env_logger) >= 0.4.3 with crate(env_logger) < 0.5.0) @@ -53,7 +50,13 @@ which use %{crate} from crates.io. %if %{with check} %check -%cargo_test +# https://github.com/m4b/goblin/issues/64 +%cargo_test \ + %ifarch ppc64 s390x + || : + %else + ; + %endif %endif %files devel @@ -62,6 +65,9 @@ which use %{crate} from crates.io. %{cargo_registry}/%{crate}-%{version}/ %changelog +* Mon Jan 01 2018 Igor Gnatenko - 0.0.13-1 +- Update to 0.0.13 + * Mon Dec 04 2017 Igor Gnatenko - 0.0.12-2 - Fix tests diff --git a/sources b/sources index d5bbc1f..6a8e213 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (goblin-0.0.12.crate) = b8a9eb3dcc8d1e2017e4ee15035abb1db898db6cf648554cd4dbdef815c9987226e48415a40df80aa04fda9902d3767c7abf1e13cb6e8f8476e81c8ded4b36e6 +SHA512 (goblin-0.0.13.crate) = f93573377dd12854dc753de3a056d641213794236eec05e48910035610986856dfa1df5d655ddfc24cf09946f55341bc63fad2cc15a8a88290d1d14a0e7eb1ce