From a3146eec784e4a148ba6b4d826f6eb3ec5c6db4a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 20 Nov 2019 12:12:07 +0100 Subject: [PATCH] Update version_check to 0.9 Signed-off-by: Igor Gnatenko --- 0001-Update-version_check-to-0.9.patch | 26 ++++++++++++++++++++++++++ error-chain-fix-metadata.diff | 11 +++++++++++ rust-error-chain.spec | 10 +++++++++- 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 0001-Update-version_check-to-0.9.patch create mode 100644 error-chain-fix-metadata.diff diff --git a/0001-Update-version_check-to-0.9.patch b/0001-Update-version_check-to-0.9.patch new file mode 100644 index 0000000..b4456e6 --- /dev/null +++ b/0001-Update-version_check-to-0.9.patch @@ -0,0 +1,26 @@ +From f5417d2eb4f0f1398d61c9ecef948c37a073e563 Mon Sep 17 00:00:00 2001 +From: Sergio Benitez +Date: Thu, 23 May 2019 21:21:52 -0700 +Subject: [PATCH] Update version_check to 0.9. + +--- + build.rs | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/build.rs b/build.rs +index 2150a3d..e306f08 100644 +--- a/build.rs ++++ b/build.rs +@@ -5,8 +5,7 @@ use version_check::is_min_version; + fn main() { + // Switch on for versions that have Error::source + // As introduced by https://github.com/rust-lang/rust/pull/53533 +- if is_min_version("1.30").map(|(is_high_enough, _actual_version)| is_high_enough).unwrap_or(false) +- { ++ if is_min_version("1.30").unwrap_or(false) { + println!("cargo:rustc-cfg=has_error_source"); + } + } +-- +2.24.0 + diff --git a/error-chain-fix-metadata.diff b/error-chain-fix-metadata.diff new file mode 100644 index 0000000..678c527 --- /dev/null +++ b/error-chain-fix-metadata.diff @@ -0,0 +1,11 @@ +--- error-chain-0.12.1/Cargo.toml 1970-01-01T00:00:00+00:00 ++++ error-chain-0.12.1/Cargo.toml 2019-11-20T11:09:51.791818+00:00 +@@ -25,7 +25,7 @@ + version = "0.3.3" + optional = true + [build-dependencies.version_check] +-version = "0.1.5" ++version = "0.9" + + [features] + default = ["backtrace", "example_generated"] diff --git a/rust-error-chain.spec b/rust-error-chain.spec index 9a4fb76..f6255fd 100644 --- a/rust-error-chain.spec +++ b/rust-error-chain.spec @@ -10,13 +10,18 @@ Name: rust-%{crate} Version: 0.12.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Error boilerplate library # Upstream license specification: MIT/Apache-2.0 License: MIT or ASL 2.0 URL: https://crates.io/crates/error-chain Source: %{crates_source} +# Initial patched metadata +# * Update version_check to 0.9, https://github.com/rust-lang-nursery/error-chain/commit/f5417d2eb4f0f1398d61c9ecef948c37a073e563 +Patch0: error-chain-fix-metadata.diff +# Finish upgrade of version_check +Patch0001: 0001-Update-version_check-to-0.9.patch ExclusiveArch: %{rust_arches} %if %{__cargo_skip_build} @@ -99,6 +104,9 @@ which use "example_generated" feature of "%{crate}" crate. %endif %changelog +* Wed Nov 20 12:09:51 CET 2019 Igor Gnatenko - 0.12.1-4 +- Update version_check to 0.9 + * Fri Jul 26 2019 Fedora Release Engineering - 0.12.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild