diff --git a/ctrlc-3.1.1-fix-metadata.diff b/ctrlc-fix-metadata.diff similarity index 73% rename from ctrlc-3.1.1-fix-metadata.diff rename to ctrlc-fix-metadata.diff index c5c7eb0..bfefd7c 100644 --- a/ctrlc-3.1.1-fix-metadata.diff +++ b/ctrlc-fix-metadata.diff @@ -1,12 +1,14 @@ --- ctrlc-3.1.1/Cargo.toml 1970-01-01T01:00:00+01:00 -+++ ctrlc-3.1.1/Cargo.toml 2018-07-17T09:55:32.501826+02:00 -@@ -30,9 +30,3 @@ ++++ ctrlc-3.1.1/Cargo.toml 2019-02-04T10:10:28.553661+01:00 +@@ -29,10 +29,4 @@ + [features] termination = [] [target."cfg(unix)".dependencies.nix] - version = "0.11" +-version = "0.11" -[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.13" diff --git a/rust-ctrlc.spec b/rust-ctrlc.spec index b363681..d52f6e3 100644 --- a/rust-ctrlc.spec +++ b/rust-ctrlc.spec @@ -6,21 +6,22 @@ Name: rust-%{crate} Version: 3.1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Easy Ctrl-C handler for Rust projects # Upstream license specification: MIT/Apache-2.0 License: MIT or ASL 2.0 URL: https://crates.io/crates/ctrlc -Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate +Source: %{crates_source} # Initial patched metadata # * No windows -Patch0: ctrlc-3.1.1-fix-metadata.diff +# * Bump nix to 0.13, https://github.com/Detegr/rust-ctrlc/pull/48 +Patch0: ctrlc-fix-metadata.diff ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging -BuildRequires: (crate(nix/default) >= 0.11.0 with crate(nix/default) < 0.12.0) +BuildRequires: (crate(nix/default) >= 0.13.0 with crate(nix/default) < 0.14.0) %global _description \ Easy Ctrl-C handler for Rust projects. @@ -67,7 +68,7 @@ which use "termination" feature of "%{crate}" crate. %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml %prep -%autosetup -n %{crate}-%{version} -p1 +%autosetup -n %{crate}-%{version_no_tilde} -p1 %cargo_prep %build @@ -82,6 +83,9 @@ which use "termination" feature of "%{crate}" crate. %endif %changelog +* Mon Feb 04 2019 Igor Gnatenko - 3.1.1-4 +- Update nix to 0.13 + * Sat Feb 02 2019 Fedora Release Engineering - 3.1.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/tests/.fmf/version b/tests/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/tests/provision.fmf b/tests/provision.fmf new file mode 100644 index 0000000..503a97c --- /dev/null +++ b/tests/provision.fmf @@ -0,0 +1,5 @@ +--- +standard-inventory-qcow2: + qemu: + # `cargo test` usually eats more than 1G. + m: 4G diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..7d9ac1f --- /dev/null +++ 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-ctrlc