From d2417fc14f86df628b97e4c03cf69e98a8f082fc Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Tue, 4 Jun 2019 16:47:15 -0700 Subject: [PATCH] Bump nix to 0.14 --- ctrlc-fix-metadata.diff | 8 +++++--- rust-ctrlc.spec | 10 +++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ctrlc-fix-metadata.diff b/ctrlc-fix-metadata.diff index 3f83c5f..47befca 100644 --- a/ctrlc-fix-metadata.diff +++ b/ctrlc-fix-metadata.diff @@ -1,12 +1,14 @@ --- ctrlc-3.1.2/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ ctrlc-3.1.2/Cargo.toml 2019-04-24T06:33:38.354714+00:00 -@@ -30,9 +30,3 @@ ++++ ctrlc-3.1.2/Cargo.toml 2019-06-04T22:52:04.585684+00:00 +@@ -29,10 +29,4 @@ + [features] termination = [] [target."cfg(unix)".dependencies.nix] - version = "0.13" +-version = "0.13" -[target."cfg(windows)".dependencies.winapi] -version = "0.3" -features = ["consoleapi", "handleapi", "synchapi", "winbase"] -[target."cfg(windows)".dev-dependencies.winapi] -version = "0.3" -features = ["fileapi", "processenv", "winnt"] ++version = "0.14" diff --git a/rust-ctrlc.spec b/rust-ctrlc.spec index 4f88e26..2298cef 100644 --- a/rust-ctrlc.spec +++ b/rust-ctrlc.spec @@ -6,7 +6,7 @@ Name: rust-%{crate} Version: 3.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Easy Ctrl-C handler for Rust projects # Upstream license specification: MIT/Apache-2.0 @@ -14,13 +14,14 @@ License: MIT or ASL 2.0 URL: https://crates.io/crates/ctrlc Source: %{crates_source} # Initial patched metadata -# * Bump nix to 0.13, https://github.com/Detegr/rust-ctrlc/pull/48 +# * Bump nix to 0.14, https://github.com/Detegr/rust-ctrlc/pull/52 +# * No Windows deps Patch0: ctrlc-fix-metadata.diff ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging -BuildRequires: (crate(nix/default) >= 0.13.0 with crate(nix/default) < 0.14.0) +BuildRequires: (crate(nix/default) >= 0.14.0 with crate(nix/default) < 0.15.0) %global _description \ Easy Ctrl-C handler for Rust projects. @@ -82,6 +83,9 @@ which use "termination" feature of "%{crate}" crate. %endif %changelog +* Tue Jun 04 2019 Josh Stone - 3.1.2-2 +- Bump nix to 0.14 + * Wed Apr 24 08:33:38 CEST 2019 Igor Gnatenko - 3.1.2-1 - Update to 3.1.2