Compare commits

...

3 Commits

Author SHA1 Message Date
Steven Presti d23d874d52 spec: new upstream version 0.20.0 2024-01-17 06:29:26 +00:00
Steven Presti 14d891a398 spec: new upstream version 0.18.0
resolves: #https://issues.redhat.com/browse/RHEL-17424
2023-11-29 12:09:33 -05:00
Antonio Murdaca 4074029c0b
bump to build with rhel-target=exception
Resolves: rhbz#2232406

Signed-off-by: Antonio Murdaca <antoniomurdaca@gmail.com>
2023-09-11 12:29:35 +02:00
5 changed files with 22 additions and 19 deletions

4
.gitignore vendored
View File

@ -35,3 +35,7 @@
/coreos-installer-0.17.0.crate
/coreos-installer-0.17.0-vendor.tar.gz
/coreos-installer-dracut-7181733.tar.gz
/coreos-installer-0.18.0.crate
/coreos-installer-0.18.0-vendor.tar.gz
/coreos-installer-0.20.0.crate
/coreos-installer-0.20.0-vendor.tar.gz

View File

@ -0,0 +1,2 @@
5ae41aa85d3f14f99269bcf42f98c0b42cdf1223 coreos-installer-0.20.0.crate
7253a42e61e0b07b880f1f81efaf5eb35bca5a30 coreos-installer-0.20.0-vendor.tar.gz

View File

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

View File

@ -11,8 +11,8 @@
%global crate coreos-installer
Name: rust-%{crate}
Version: 0.17.0
Release: 3%{?dist}
Version: 0.20.0
Release: 1%{?dist}
Summary: Installer for Fedora CoreOS and RHEL CoreOS
# Upstream license specification: Apache-2.0
@ -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,16 @@ from the initramfs.
%endif
%changelog
* Thu Jan 04 2024 Steven Presti <spresti@redhat.com> - 0.20.0-1
- New version
- Remove rdcore patch, and move its logic into %prep
* Tue Nov 28 2023 Steven Presti <spresti@redhat.com> - 0.18.0-1
- New version
* Mon Sep 11 2023 Antonio Murdaca <antoniomurdaca@gmail.com> - 0.17.0-4
- rebuilt to use rhel-target=exception
* Fri Sep 08 2023 Antonio Murdaca <antoniomurdaca@gmail.com> - 0.17.0-3
- rebuilt to hopefully fix up builds for 9.3

View File

@ -1,3 +1,3 @@
SHA512 (coreos-installer-0.17.0.crate) = 78deef9b7ebf1277255e2f17a868ba0dd09f40152aeb3380cdc1387c0daa93715a0f9089f27d2a3b70464fe14e2e4764f6da222ff7bfbdfed880b0e3794d92db
SHA512 (coreos-installer-0.17.0-vendor.tar.gz) = 66af1322276cba44b974c536b3277b1e69893bd53f87f97a79fe9a8746fdd5d9230e88434d1c8f9c333e146deadd5e8122d9732fbba2f82aabbacf154d7ea68f
SHA512 (coreos-installer-0.20.0.crate) = 8ad94b27e431b51222bd14c39ddd41c9577eb05d4b22855efb2741a9d1a71030070c370ac4477cd26fa7e9c96acf9146c1b3ec6f3c9a0e5055cf3c7ba7d625e5
SHA512 (coreos-installer-0.20.0-vendor.tar.gz) = 4556679728b52579306fc54ef50de93a32c1708a8d5cf9f8c70eb9d6f0d7b3492ef65a4e22442251d105408f47f3508e1b7ae9c88d3485305b0799ca80ef8eb7
SHA512 (coreos-installer-dracut-7181733.tar.gz) = a03e3e90f355690eda974335e2189c69837f7f0ceb456a449b2de6ce4b24ca098d3f0ea51ddcab35ab354a5070e4b0525188dfbbff8056cfc62bbcdded10647c