rust-coreos-installer.spec: update with latest version

This commit is contained in:
Steven Presti 2022-09-15 17:01:45 -04:00
parent 82e9364181
commit 9247207f57
5 changed files with 14 additions and 82 deletions

2
.gitignore vendored
View File

@ -25,3 +25,5 @@
/coreos-installer-0.15.0.crate
/coreos-installer-0.15.0-vendor.tar.gz
/coreos-installer-dracut-89d5789.tar.gz
/coreos-installer-0.16.0.crate
/coreos-installer-0.16.0-vendor.tar.gz

View File

@ -1,52 +0,0 @@
From 6c48395ba03426ddaa0090ea82a2c1aaa11da6cd Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Mon, 22 Aug 2022 10:55:25 -0400
Subject: [PATCH 1/2] signing-keys: add Fedora 38 key
We branched F37 from rawhide so rawhide is now F38.
---
src/signing-keys.asc | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/src/signing-keys.asc b/src/signing-keys.asc
index e61941f..32c3ec3 100644
--- a/src/signing-keys.asc
+++ b/src/signing-keys.asc
@@ -121,3 +121,34 @@ tg+fuT+OFKWYdBFF7VkEA+wezHAznIP6TPyQXbBpkzE889/hOXy4BYs0wy8Bpda/
Ve2Ba329f99dSCZKImi5DPCxJY4=
=ZmVd
-----END PGP PUBLIC KEY BLOCK-----
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: RPM-GPG-KEY-fedora-38-primary
+
+mQINBGIC2cYBEADJye1aE0AR17qwj6wsHWlCQlcihmqkL8s4gbOk1IevBbH4iXJx
+lu6bN+NhTcCCX6eHmaL5Pwb/bpkMmLR+/r1D2cLDK24YzvN6kJnwRQUTf2dbqYmg
+mNBgIMm+kAabBZPwUHUzyQ9CT/WJpYr1OYu8JIkdxF35nrPewnnOUUqxqbi8fXRQ
+gskSLF8UveiOjFIqmWwlPwT1UtnevAaF80UGQlkwFvqjjh4b9vKY2gHMAQwt+wg5
+HFFCSwSrnd88ZoDb3pKvDMeurYUiPzF5f2r+ziVkMuaSNckvp58uge7HvyqQPAdJ
+ZRswCCxhUAo9VqkNfB4Ud25ASyalk9jOE3HB8E35gFfPXvuX1n15THXNcwMEiybk
+Omne2YwXL8ShGNr5otjqywThMrrqcl2g/pJVTcpDHTR5Hn9YRp+GHlYLjyEr+/x7
+xM19y9ca9GUiJqDbEREHcKKIhYiGmcIjjcJvei/3C/aM4pqeGFJBbVSnw3qeMxH/
+6ArAMA1sAdShCkv2YjlcF0r4uoCjXdS3xrKLz9PSCquot7RySnOE9TZ7flfJll7Z
+q+lNaSeJg7FK8VWSUb9Lit6VEYVbzWKzespDDbujrHbFpydyq8gXurk7bSR2w0te
+gsmytQqT/w1z2bydgGF6SfY9Px0wuA8GQKr48l5Bhdc6+vHHFqPKzz0PVQARAQAB
+tDFGZWRvcmEgKDM4KSA8ZmVkb3JhLTM4LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
+cmc+iQJOBBMBCAA4FiEEalG7q7o9VGe2FxIhgJqNfOsQtGQFAmIC2cYCGw8FCwkI
+BwIGFQoJCAsCBBYCAwECHgECF4AACgkQgJqNfOsQtGScyw/7BLmD4Fwi4QZY94zl
+vlJdNufZRavOemSIVVDHoCr8pQBAdrvoMypxJd5zM4ODIqFsjdYpFti+Tkeq4/4U
+25UoLPEOtU8UDt2uq7LqfdCxspaj7VyXAJIkpf7wEvLS4Jzo+YaMIlsd0dCrMXTM
+vhu4gKpBFW6C+gGlmuDyTJbyrf7ilytgVzVtIfRrT7XffylviIlZHwKm43UDjvzX
+YEl3EAFR1RjATwXMy2aJh7GCNsz+fKs+7YRKQUhpMF5un/2pyNJO+LbVGGwGZvga
+K9Kfsg/4r1ync4nDDD1dadKIHhobDeiJ9uZLoBvvVDz7Ywu7q/vv4zIPxstYBNq4
+6fLKDtYXuJCK0EV9Qy4ox67t0UGlaRGH8y5YUqOI10xH7iQej0xWlSc8w2dKhPz8
+z9XLv2OMK+PvqvflhFHhWkqEoQRqTu0TVD0fLLe4lqieJlqZcJqW0F9G/vNSSWmf
+POLa/Nim71gL2fPjCJOIRV4K/cJSyBmu5NchG7dHD5sUtJxZ4TFSuepaBZ8cPK1x
+e26TaCBqoUWgUXWmw+P89aOpYOJYEFfT/VAm2Ywn+c1EFUmD+30wQ7aP/RUFl94z
+n0BjqsWDnCKVFHydZ0TZSpeADmXMg2VYZPcp/cQR1KjoBoDxAscis7b1XPQUg7CB
+zquq5jBVAnsNIhs7g47GWKyDUJM=
+=aCLl
+-----END PGP PUBLIC KEY BLOCK-----
--
2.32.0

View File

@ -1,20 +0,0 @@
--- 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"
[dependencies.regex]
-version = ">= 1.4, < 1.6"
+version = ">= 1.4, < 2"
[dependencies.reqwest]
version = ">= 0.10, < 0.12"

View File

@ -11,8 +11,8 @@
%global crate coreos-installer
Name: rust-%{crate}
Version: 0.15.0
Release: 5%{?dist}
Version: 0.16.0
Release: 1%{?dist}
Summary: Installer for Fedora CoreOS and RHEL CoreOS
# Upstream license specification: Apache-2.0
@ -23,12 +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
# https://github.com/coreos/coreos-installer/pull/921
Patch0: fix-metadata.patch
# https://github.com/coreos/coreos-installer/pull/963
Patch1: 0001-signing-keys-add-Fedora-38-key.patch
ExclusiveArch: %{rust_arches}
%if 0%{?rhel} && !0%{?eln}
BuildRequires: rust-toolset
@ -39,6 +33,7 @@ BuildRequires: xz-devel
BuildRequires: rust-packaging
%endif
BuildRequires: systemd-rpm-macros
BuildRequires: libzstd-devel
# For tests
BuildRequires: gnupg2
@ -126,6 +121,7 @@ install -D -m 0755 -t %{buildroot}%{dracutlibdir}/modules.d/50rdcore dracut/50rd
make install-scripts DESTDIR=%{buildroot}
make install-systemd DESTDIR=%{buildroot}
make install-man DESTDIR=%{buildroot}
make install-data DESTDIR=%{buildroot}
mv %{buildroot}%{_bindir}/rdcore %{buildroot}%{dracutlibdir}/modules.d/50rdcore/
%endif
@ -172,6 +168,8 @@ from the initramfs.
%doc README.md
%{_bindir}/coreos-installer
%{_mandir}/man8/*
%dir %{_datadir}/coreos-installer
%{_datadir}/coreos-installer/example-config.yaml
%if %{with check}
%check
@ -183,6 +181,10 @@ from the initramfs.
%endif
%changelog
* Thu Sep 15 2022 Steven Presti <spresti@redhat.com> - 0.16.0-1
- New release
- Add libzstd dependency
* Mon Aug 22 2022 Dusty Mabe <dusty@dustymabe.com> - 0.15.0-5
- Backport patch that adds F38 signing key

View File

@ -1,3 +1,3 @@
SHA512 (coreos-installer-0.15.0.crate) = b1ef91e5710eb10ff06b2fb0bc0f3f78c28796e863caebd89d3ffac35a6347dfb107a072403e2c9a0b129ee32d0f73c331fd3a19d0476f4dcbb8836a1ea1b70a
SHA512 (coreos-installer-0.15.0-vendor.tar.gz) = c1fec1b196622cf1710b27d220aa748eb4322fb69f899f34037ae266883e7d63d6986f8d31bd3eaeeceeaa2a13f728f2e4e310697d6dc271e6ddc370d0c99160
SHA512 (coreos-installer-0.16.0.crate) = 4ec80cd9af5ab351655fb8719aa748b6e4d1dd672b9bdf9c00c8cbe1476cc10623835d1a2d42edb3d46bf3e6001ecdc797ebf1438fb1ef9be26a7d3ef59542d4
SHA512 (coreos-installer-0.16.0-vendor.tar.gz) = d2154213807048636f80e10bb1701b3b89a1f14d9ed743477e12a4038615cb47b9bf1c8a905ee1436028b319f94d0c62da23bef9bd3357603287ea6ec80c1889
SHA512 (coreos-installer-dracut-89d5789.tar.gz) = deed6561a922382f781c14fe3ba3c322c7ad2c4e5cc353e54b443b9bf0a0f6a3ab4a32e42e600371b157963fb7fa0ff4f1c9418c74999225b972674b3b992cfb