From ea82314e59ef570fb20acb9771ad2cadb7229cbe Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 9 Jun 2019 13:57:17 +0200 Subject: [PATCH] Update to 3.1.3 Signed-off-by: Igor Gnatenko --- .gitignore | 1 + ctrlc-fix-metadata.diff | 10 ++++------ rust-ctrlc.spec | 19 +++++++++++++------ sources | 2 +- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index c6d4bf9..bf8533b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /ctrlc-3.1.0.crate /ctrlc-3.1.1.crate /ctrlc-3.1.2.crate +/ctrlc-3.1.3.crate diff --git a/ctrlc-fix-metadata.diff b/ctrlc-fix-metadata.diff index 47befca..6f5351a 100644 --- a/ctrlc-fix-metadata.diff +++ b/ctrlc-fix-metadata.diff @@ -1,14 +1,12 @@ ---- ctrlc-3.1.2/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ ctrlc-3.1.2/Cargo.toml 2019-06-04T22:52:04.585684+00:00 -@@ -29,10 +29,4 @@ - [features] +--- ctrlc-3.1.3/Cargo.toml 1970-01-01T00:00:00+00:00 ++++ ctrlc-3.1.3/Cargo.toml 2019-06-09T11:56:40.940082+00:00 +@@ -31,9 +31,3 @@ termination = [] [target."cfg(unix)".dependencies.nix] --version = "0.13" + version = "0.14" -[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 2298cef..057abd1 100644 --- a/rust-ctrlc.spec +++ b/rust-ctrlc.spec @@ -1,12 +1,12 @@ -# Generated by rust2rpm +# Generated by rust2rpm 9 %bcond_without check %global debug_package %{nil} %global crate ctrlc Name: rust-%{crate} -Version: 3.1.2 -Release: 2%{?dist} +Version: 3.1.3 +Release: 1%{?dist} Summary: Easy Ctrl-C handler for Rust projects # Upstream license specification: MIT/Apache-2.0 @@ -14,17 +14,21 @@ License: MIT or ASL 2.0 URL: https://crates.io/crates/ctrlc Source: %{crates_source} # Initial patched metadata -# * Bump nix to 0.14, https://github.com/Detegr/rust-ctrlc/pull/52 # * No Windows deps Patch0: ctrlc-fix-metadata.diff ExclusiveArch: %{rust_arches} +%if %{__cargo_skip_build} +BuildArch: noarch +%endif BuildRequires: rust-packaging +%if ! %{__cargo_skip_build} BuildRequires: (crate(nix/default) >= 0.14.0 with crate(nix/default) < 0.15.0) +%endif -%global _description \ -Easy Ctrl-C handler for Rust projects. +%global _description %{expand: +Easy Ctrl-C handler for Rust projects.} %description %{_description} @@ -83,6 +87,9 @@ which use "termination" feature of "%{crate}" crate. %endif %changelog +* Sun Jun 09 13:56:41 CEST 2019 Igor Gnatenko - 3.1.3-1 +- Update to 3.1.3 + * Tue Jun 04 2019 Josh Stone - 3.1.2-2 - Bump nix to 0.14 diff --git a/sources b/sources index fcb59d9..c5e925b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ctrlc-3.1.2.crate) = cf69fb4c74e1f1dcce187c2487555bc52464d480f08dca9cab12880d1175f49e22270b2dd56abde6da4eebe28e5c2ab7ff022d1226705715b0f390346b47e04b +SHA512 (ctrlc-3.1.3.crate) = b77b0ccfe31110c514795b390b0500cb7349d4dfa2367f6d6b9612cce3d9dfa4cbbf96018da71ff4488258a0aeb2911e0436df35ea52c3e6a464bcbe027f12e8