Fix build with rust-regex 1.6.0

(cherry picked from commit aeb1acd874)
This commit is contained in:
Benjamin Gilbert 2022-07-09 22:05:00 -04:00 committed by Dusty Mabe
parent 6c040c2b34
commit b45977108d
No known key found for this signature in database
GPG Key ID: 3302DBD73952E671
2 changed files with 18 additions and 1 deletions

11
fix-metadata.patch Normal file
View File

@ -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"

View File

@ -12,7 +12,7 @@
Name: rust-%{crate}
Version: 0.15.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Installer for Fedora CoreOS and RHEL CoreOS
# Upstream license specification: Apache-2.0
@ -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
@ -184,6 +187,9 @@ from the initramfs.
%endif
%changelog
* Mon Aug 22 Dusty Mabe <dusty@dustymabe.com> - 0.15.0-2
- Fix build with rust-regex 1.6.0
* Fri Jun 17 2022 Michael Armijo <marmijo@redhat.com> - 0.15.0-1
- New release
- Install non-binary files using Makefile install targets