From 58359957601077abf1bbf6110f1aa7846c1cc635 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 25 Jan 2024 00:01:36 -0500 Subject: [PATCH] rpm: use go-rpm-macros on RHEL 10 [NO NEW TESTS NEEDED] The macros in ELN and c10s have the necessary support. Signed-off-by: Yaakov Selkowitz --- rpm/podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/podman.spec b/rpm/podman.spec index be99d282c6..e5e233858d 100644 --- a/rpm/podman.spec +++ b/rpm/podman.spec @@ -12,7 +12,7 @@ # until that's fixed. # c9s bz: https://bugzilla.redhat.com/show_bug.cgi?id=2227328 # c8s bz: https://bugzilla.redhat.com/show_bug.cgi?id=2227331 -%if %{defined rhel} && !%{defined eln} +%if %{defined rhel} && 0%{?rhel} < 10 %define gobuild(o:) go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "-linkmode=external -compressdwarf=false ${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**}; # python3 dep conditional for rhel8 %if %{?rhel} == 8