diff --git a/.gitignore b/.gitignore index 274be58..ce79b95 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,5 @@ /afterburn-5.4.0-vendor.tar.gz /afterburn-5.4.2.crate /afterburn-5.4.2-vendor.tar.gz +/afterburn-5.4.3.crate +/afterburn-5.4.3-vendor.tar.gz diff --git a/rust-afterburn.spec b/rust-afterburn.spec index d31c242..edbaab5 100644 --- a/rust-afterburn.spec +++ b/rust-afterburn.spec @@ -6,8 +6,8 @@ %global crate afterburn Name: rust-afterburn -Version: 5.4.2 -Release: 2%{?dist} +Version: 5.4.3 +Release: 1%{?dist} Summary: Simple cloud provider agent License: Apache-2.0 @@ -16,7 +16,7 @@ Source0: %{crates_source} # not used on Fedora Source1: https://github.com/coreos/%{crate}/releases/download/v%{version}/%{crate}-%{version}-vendor.tar.gz -%if 0%{?rhel} && !0%{?eln} +%if 0%{?rhel} BuildRequires: rust-toolset BuildRequires: openssl-devel # This is needed because the cc crate, which is @@ -104,16 +104,8 @@ to run in the initramfs on boot. %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 -%if 0%{?rhel} && !0%{?eln} -tar xvf %{SOURCE1} -mkdir -p .cargo -cat >.cargo/config << EOF -[source.crates-io] -replace-with = "vendored-sources" - -[source.vendored-sources] -directory = "vendor" -EOF +%if 0%{?rhel} +%cargo_prep -V 1 %else %cargo_prep %endif @@ -124,7 +116,7 @@ sed -e 's,@DEFAULT_INSTANCE@,core,' < \ systemd/afterburn-sshkeys@.service.in > \ systemd/afterburn-sshkeys@.service -%if !0%{?rhel} || 0%{?eln} +%if !0%{?rhel} %generate_buildrequires %cargo_generate_buildrequires %endif @@ -135,7 +127,7 @@ sed -e 's,@DEFAULT_INSTANCE@,core,' < \ %{?cargo_license} > LICENSE.dependencies %install -%if 0%{?rhel} && !0%{?eln} +%if 0%{?rhel} %make_install INSTALL="install -p -c" %else %cargo_install @@ -151,6 +143,9 @@ cp -a dracut/* %{buildroot}%{dracutmodulesdir} %endif %changelog +* Wed Oct 04 2023 Yaakov Selkowitz - 5.4.3-1 +- Update to 5.4.3 + * Fri Jul 21 2023 Fedora Release Engineering - 5.4.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 60ec2bd..aa14e25 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (afterburn-5.4.2.crate) = 8facf3e620ff0f835e605cd309bce36a536c4afb4e94dd005fc9af7611cbea22f2557e2f64bea9dedfa2ebf8ea30bff5d57a8ca316c37b4e171d10f28f78cf6a -SHA512 (afterburn-5.4.2-vendor.tar.gz) = 86d327c9b2de0b4987643d00b100197fbbbe259cc6dec6015b5878f607049a86b66825460890725d3216633e046aea6ac3bdf7daa4ef72c2fb7b7f0fed52d578 +SHA512 (afterburn-5.4.3.crate) = 265a384f1c02b2ec3c5876d09f22a285967f064b5dceec0ef93091463f66a1461891dc45576525ae4b980be7ad78ea07e21050240011313dc0e79d75b5a89b0e +SHA512 (afterburn-5.4.3-vendor.tar.gz) = 3de6b074f9f68395dd6b309f3ce5c6843cddbdbbc303242ad1484e773190f4c7aca9e87c9e0dc1fc51c7f03b0d028f6cd12ac09ae0dca5c2afedd0253f65c6be