From 7f7ad320ba038c6178b2cf52487ccacc615f8beb Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 25 Jan 2024 00:10:24 -0500 Subject: [PATCH] Use go-rpm-macros on RHEL 10 The macros in ELN and c10s have the necessary support. https://github.com/containers/podman/pull/21358 --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 58f3a15..d86905c 100644 --- a/podman.spec +++ b/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