From aeb1acd874e9dae6604fdb1a9d93631e5bcee301 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Sat, 9 Jul 2022 22:05:00 -0400 Subject: [PATCH] Fix build with rust-regex 1.6.0 --- fix-metadata.patch | 11 +++++++++++ rust-coreos-installer.spec | 4 ++++ 2 files changed, 15 insertions(+) create mode 100644 fix-metadata.patch diff --git a/fix-metadata.patch b/fix-metadata.patch new file mode 100644 index 0000000..d460dd9 --- /dev/null +++ b/fix-metadata.patch @@ -0,0 +1,11 @@ +--- 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 +@@ -114,7 +114,7 @@ + version = ">= 0.3, < 0.5" + + [dependencies.regex] +-version = ">= 1.4, < 1.6" ++version = ">= 1.4, < 2" + + [dependencies.reqwest] + version = ">= 0.10, < 0.12" diff --git a/rust-coreos-installer.spec b/rust-coreos-installer.spec index a74954b..8eef09c 100644 --- a/rust-coreos-installer.spec +++ b/rust-coreos-installer.spec @@ -23,6 +23,9 @@ Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{ Source1: https://github.com/coreos/%{crate}/releases/download/v%{version}/%{crate}-%{version}-vendor.tar.gz Source2: https://github.com/coreos/coreos-installer-dracut/archive/%{dracutcommit}/coreos-installer-dracut-%{dracutshortcommit}.tar.gz +# https://github.com/coreos/coreos-installer/pull/921 +Patch0: fix-metadata.patch + ExclusiveArch: %{rust_arches} %if 0%{?rhel} && !0%{?eln} BuildRequires: rust-toolset @@ -179,6 +182,7 @@ from the initramfs. %changelog * Sun Jul 10 2022 Benjamin Gilbert - 0.15.0-2 - Sync coreos-installer-dracut with CentOS Stream 9 +- Fix build with rust-regex 1.6.0 * Fri Jun 17 2022 Michael Armijo - 0.15.0-1 - New release