From 186eef04f42bf71d96f8ec951cbf62d6f009e6c1 Mon Sep 17 00:00:00 2001 From: Gilver Date: Thu, 29 May 2025 18:31:17 -0500 Subject: [PATCH] fix(anda): Ifcond to build on EL10 (#5131) (#5134) Anda is out of sync on EL10 and can't update due to the specs being different, this should allow us to normalize them. (cherry picked from commit bc53eb54454d9f9aed5a89d1ec753136725b68a5) Signed-off-by: Gilver Signed-off-by: RockGrub --- anda/tools/buildsys/anda/rust-anda.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/anda/tools/buildsys/anda/rust-anda.spec b/anda/tools/buildsys/anda/rust-anda.spec index a560d15d1c..10ffb8430b 100644 --- a/anda/tools/buildsys/anda/rust-anda.spec +++ b/anda/tools/buildsys/anda/rust-anda.spec @@ -5,7 +5,7 @@ %global crate anda Name: rust-anda -Version: 0.4.9 +Version: 0.4.12 Release: 1%?dist Summary: Andaman Build toolchain @@ -18,6 +18,9 @@ ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging >= 21 BuildRequires: anda-srpm-macros BuildRequires: openssl-devel +%if 0%{?fedora} +BuildRequires: openssl-devel-engine +%endif BuildRequires: git-core BuildRequires: libgit2-devel BuildRequires: libssh2-devel @@ -41,6 +44,7 @@ Summary: %{summary} %description -n %{crate} %{_description} %files -n %{crate} +%license LICENSE.dependencies LICENSE.md %{_bindir}/anda %{_mandir}/man1/anda*.1* %config %{_sysconfdir}/bash_completion.d/anda.bash @@ -52,12 +56,13 @@ Summary: %{summary} %cargo_prep_online %build -# %%cargo_build +%cargo_build +%{cargo_license_online} > LICENSE.dependencies cargo run --release -p xtask -- manpage cargo run --release -p xtask -- completion %install -%cargo_install +install -Dpm755 target/rpm/anda -t %buildroot%_bindir/ mkdir -p %{buildroot}%{_mandir}/man1/