diff --git a/.gitignore b/.gitignore index 1cff659..7fbc19c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -SOURCES/coreos-installer-0.17.0-vendor.tar.gz -SOURCES/coreos-installer-0.17.0.crate -SOURCES/coreos-installer-dracut-5a456ad.tar.gz +SOURCES/coreos-installer-0.21.0-vendor.tar.gz +SOURCES/coreos-installer-0.21.0.crate +SOURCES/coreos-installer-dracut-7181733.tar.gz diff --git a/.rust-coreos-installer.metadata b/.rust-coreos-installer.metadata index 2244149..dde8112 100644 --- a/.rust-coreos-installer.metadata +++ b/.rust-coreos-installer.metadata @@ -1,3 +1,3 @@ -cd154ac49206aba962ba815c65f4808e7103aa36 SOURCES/coreos-installer-0.17.0-vendor.tar.gz -86814b29f286cf83d323db78c6ed4b083a35414b SOURCES/coreos-installer-0.17.0.crate -6dd225c4d210b3a2e6ded364e243471934483e30 SOURCES/coreos-installer-dracut-5a456ad.tar.gz +fe23218c1231918cc4a02ee9f6b523f00f34d083 SOURCES/coreos-installer-0.21.0-vendor.tar.gz +9929a21d59a54ce99cd4b152cd6c473cfc500fee SOURCES/coreos-installer-0.21.0.crate +81f96c32efa9e32730e1f3bda5a820d33229f006 SOURCES/coreos-installer-dracut-7181733.tar.gz diff --git a/SOURCES/enable-rdcore.patch b/SOURCES/enable-rdcore.patch deleted file mode 100644 index fd07a03..0000000 --- a/SOURCES/enable-rdcore.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur a/Cargo.toml b/Cargo.toml ---- a/Cargo.toml 1969-12-31 19:00:01.000000000 -0500 -+++ b/Cargo.toml 2023-03-14 07:57:14.025021766 -0400 -@@ -195,6 +195,7 @@ - - [features] - docgen = ["dep:clap_mangen"] -+default = ["rdcore"] - rdcore = [] - - [target."cfg(target_arch = \"s390x\")".dependencies.mbrman] diff --git a/SPECS/rust-coreos-installer.spec b/SPECS/rust-coreos-installer.spec index 9acf0bf..ba193f1 100644 --- a/SPECS/rust-coreos-installer.spec +++ b/SPECS/rust-coreos-installer.spec @@ -5,13 +5,13 @@ # The library is for internal code reuse and is not a public API %global __cargo_is_lib 0 -%global dracutcommit 5a456ad690acffb43d49abed9f1940c915d68694 +%global dracutcommit 71817332483aad341ffc666ed69b7869a7a90652 %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) %global crate coreos-installer Name: rust-%{crate} -Version: 0.17.0 +Version: 0.21.0 Release: 1%{?dist} Summary: Installer for Fedora CoreOS and RHEL CoreOS @@ -23,10 +23,6 @@ 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 -# The RHEL 8 rust-toolset macros don't let us enable features from the -# %%cargo_* macros. Enable rdcore directly in Cargo.toml. -Patch0: enable-rdcore.patch - ExclusiveArch: %{rust_arches} %if 0%{?rhel} && !0%{?eln} BuildRequires: rust-toolset @@ -85,6 +81,8 @@ Obsoletes: coreos-installer-dracut < 0.0.1 %prep %autosetup -n %{crate}-%{version} -p1 -a 2 %if 0%{?rhel} && !0%{?eln} +# Hackily enable rdcore manually on RHEL (RHEL macros do not take -f) +sed -i '/^\[features\]/a \ \ default = ["rdcore"]' Cargo.toml tar xvf %{SOURCE1} mkdir -p .cargo cat >.cargo/config << EOF @@ -185,6 +183,25 @@ from the initramfs. %endif %changelog +* Mon Feb 26 2024 Steven Presti - 0.21.0-1 +- New release + +* Thu Jan 04 2024 Steven Presti - 0.20.0-1 +- New version +- Remove rdcore patch, and move its logic into %prep + +* Tue Nov 28 2023 Steven Presti - 0.18.0-1 +- New version + +* Mon Sep 11 2023 Antonio Murdaca - 0.17.0-4 +- rebuilt to use rhel-target=exception + +* Fri Sep 08 2023 Antonio Murdaca - 0.17.0-3 +- rebuilt to hopefully fix up builds for 9.3 + +* Fri Sep 01 2023 Antonio Murdaca - 0.17.0-2 +- Fix rhbz#2236826 + * Tue Mar 14 2023 Benjamin Gilbert - 0.17.0-1 - New release