From 8bc9f2c635800d950956ba13eee0d3ba9e22dcf9 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Mon, 3 Dec 2018 11:26:59 -0800 Subject: [PATCH] Update to 0.1.12 --- .gitignore | 1 + 0001-bump-tokio-process-to-0.2.patch | 34 ---------------------------- jobserver-0.1.11-fix-metadata.diff | 12 ---------- jobserver-fix-metadata.diff | 8 +++++++ rust-jobserver.spec | 12 +++++----- sources | 2 +- 6 files changed, 16 insertions(+), 53 deletions(-) delete mode 100644 0001-bump-tokio-process-to-0.2.patch delete mode 100644 jobserver-0.1.11-fix-metadata.diff create mode 100644 jobserver-fix-metadata.diff diff --git a/.gitignore b/.gitignore index 5b8083b..6cf6ef5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /jobserver-0.1.9.crate /jobserver-0.1.10.crate /jobserver-0.1.11.crate +/jobserver-0.1.12.crate diff --git a/0001-bump-tokio-process-to-0.2.patch b/0001-bump-tokio-process-to-0.2.patch deleted file mode 100644 index 030ba85..0000000 --- a/0001-bump-tokio-process-to-0.2.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 949a7778db0d181dbae3cc9e9074f1bb284b7c43 Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Thu, 14 Jun 2018 11:51:07 +0200 -Subject: [PATCH] bump tokio-process to 0.2 - -Signed-off-by: Igor Gnatenko ---- - tests/client.rs | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/tests/client.rs b/tests/client.rs -index 4147191..69b88ea 100644 ---- a/tests/client.rs -+++ b/tests/client.rs -@@ -115,7 +115,6 @@ fn main() { - let filter = env::args().skip(1).next(); - - let mut core = t!(Core::new()); -- let ref handle = core.handle(); - - let futures = TESTS.iter().filter(|test| { - match filter { -@@ -136,7 +135,7 @@ all: - cmd.args(test.make_args); - cmd.current_dir(td.path()); - future::lazy(move || { -- cmd.output_async(&handle).map(move |e| { -+ cmd.output_async().map(move |e| { - drop(td); - (test, e) - }) --- -2.18.0.rc1 - diff --git a/jobserver-0.1.11-fix-metadata.diff b/jobserver-0.1.11-fix-metadata.diff deleted file mode 100644 index e26f30c..0000000 --- a/jobserver-0.1.11-fix-metadata.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- jobserver-0.1.11/Cargo.toml 1970-01-01T01:00:00+01:00 -+++ jobserver-0.1.11/Cargo.toml 2018-06-14T11:54:13.368046+02:00 -@@ -57,8 +57,6 @@ - version = "0.1" - - [dev-dependencies.tokio-process] --version = "0.1" -+version = "0.2" - [target."cfg(unix)".dependencies.libc] - version = "0.2" --[target."cfg(windows)".dependencies.rand] --version = "0.4" diff --git a/jobserver-fix-metadata.diff b/jobserver-fix-metadata.diff new file mode 100644 index 0000000..2550a44 --- /dev/null +++ b/jobserver-fix-metadata.diff @@ -0,0 +1,8 @@ +--- jobserver-0.1.12/Cargo.toml 1969-12-31T16:00:00-08:00 ++++ jobserver-0.1.12/Cargo.toml 2018-12-03T11:25:15.859774-08:00 +@@ -60,5 +60,3 @@ + version = "0.2" + [target."cfg(unix)".dependencies.libc] + version = "0.2" +-[target."cfg(windows)".dependencies.rand] +-version = "0.6" diff --git a/rust-jobserver.spec b/rust-jobserver.spec index 2a8df78..12ecf7c 100644 --- a/rust-jobserver.spec +++ b/rust-jobserver.spec @@ -6,8 +6,8 @@ %global crate jobserver Name: rust-%{crate} -Version: 0.1.11 -Release: 6%{?dist} +Version: 0.1.12 +Release: 1%{?dist} Summary: Implementation of the GNU make jobserver for Rust # Upstream license specification: MIT/Apache-2.0 @@ -16,10 +16,7 @@ URL: https://crates.io/crates/jobserver Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate # Initial patched metadata # * No windows -# * Bump tokio-process to 0.2, https://github.com/alexcrichton/jobserver-rs/pull/8 -Patch0: jobserver-0.1.11-fix-metadata.diff -# Make it work with new tokio-process -Patch1: 0001-bump-tokio-process-to-0.2.patch +Patch0: jobserver-fix-metadata.diff ExclusiveArch: %{rust_arches} @@ -81,6 +78,9 @@ which use "default" feature of "%{crate}" crate. %endif %changelog +* Mon Dec 03 2018 Josh Stone - 0.1.12-1 +- Update to 0.1.12 + * Tue Nov 13 2018 Josh Stone - 0.1.11-6 - Adapt to new packaging diff --git a/sources b/sources index 00bb307..784e203 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jobserver-0.1.11.crate) = daf8e7e994fcbf7df5265e78d3d95f2e1d3e26d2deaa43213d75e33d5a2bc1c7c7bf66aae42a0ecde7aa59514cf70d16bcdc6198fd84f244d197bb1d09f15fd3 +SHA512 (jobserver-0.1.12.crate) = 228af0a4174698b33be5ca5d1e87aac917e8d222f06594c7c69fcc541d0aba773012b791729c3e0669335147b62ce72259baf3ac0c9ededa3ef7c76752fbebe1