From e144b87002b2bd997909e7ab96b36d0d0f5fd088 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Wed, 18 Dec 2024 17:22:59 +0530
Subject: [PATCH] [skip-ci] RPM: cleanup macro defs

The default `gobuild` macro on CentOS Stream 9 now includes support for
`BUILDTAGS`.

CentOS Stream envs now also define `_user_tmpfilesdir` macro by default.

Both these definitions are no longer needed here.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 rpm/podman.spec | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/rpm/podman.spec b/rpm/podman.spec
index 852b780f67..ae3a1fcfc2 100644
--- a/rpm/podman.spec
+++ b/rpm/podman.spec
@@ -7,21 +7,8 @@
 %global debug_package %{nil}
 %endif
 
-# RHEL's default %%gobuild macro doesn't account for the BUILDTAGS variable, so we
-# set it separately here and do not depend on RHEL's go-[s]rpm-macros package
-# until that's fixed.
-# c9s bz: https://bugzilla.redhat.com/show_bug.cgi?id=2227328
-%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 %{?**};
-%endif
-
 %global gomodulesmode GO111MODULE=on
 
-%if %{defined rhel}
-# _user_tmpfiles.d currently undefined on rhel
-%global _user_tmpfilesdir %{_datadir}/user-tmpfiles.d
-%endif
-
 %if %{defined fedora}
 %define build_with_btrfs 1
 %endif