From f5ab6f0c98a3e32e87ce090ff2821a97c4aaff8a Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Mon, 1 Aug 2022 23:17:42 -0400 Subject: [PATCH] Fix build with rust-bytes 1.2.0 (cherry picked from commit ff1e39138a29f1cf27fc91b7c734c08c5d1d333a) --- fix-metadata.patch | 13 +++++++++++-- rust-coreos-installer.spec | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/fix-metadata.patch b/fix-metadata.patch index d460dd9..90142ed 100644 --- a/fix-metadata.patch +++ b/fix-metadata.patch @@ -1,5 +1,14 @@ ---- coreos-installer-0.15.0/Cargo.toml.old 2022-07-09 22:02:48.471859927 -0400 -+++ coreos-installer-0.15.0/Cargo.toml 2022-07-09 22:02:59.727862917 -0400 +--- coreos-installer-0.15.0/Cargo.toml.orig 2022-08-01 23:12:48.053388050 -0400 ++++ coreos-installer-0.15.0/Cargo.toml 2022-08-01 23:13:09.555427984 -0400 +@@ -68,7 +68,7 @@ + version = ">= 3.1.0, < 5.0.0" + + [dependencies.bytes] +-version = ">= 1.0.1, < 1.2.0" ++version = ">= 1.0.1, < 2" + + [dependencies.clap] + version = "3.1" @@ -114,7 +114,7 @@ version = ">= 0.3, < 0.5" diff --git a/rust-coreos-installer.spec b/rust-coreos-installer.spec index cf60465..bc7d33e 100644 --- a/rust-coreos-installer.spec +++ b/rust-coreos-installer.spec @@ -188,6 +188,7 @@ from the initramfs. %changelog * Mon Aug 22 Dusty Mabe - 0.15.0-2 +- Fix build with rust-bytes 1.2.0 - Fix build with rust-regex 1.6.0 * Fri Jun 17 2022 Michael Armijo - 0.15.0-1