From 84487598ad0a6c29706331364af218892c234706 Mon Sep 17 00:00:00 2001 From: Link Dupont Date: Mon, 2 Dec 2024 14:49:39 -0500 Subject: [PATCH] build(srpm): remove some uncessary commands - Move the %global setup_flags inside the %else condition - Drop 'pwd' and 'ls' from %build --- dist/srpm/rhc.spec.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dist/srpm/rhc.spec.in b/dist/srpm/rhc.spec.in index 2a2f74b..ddf8184 100644 --- a/dist/srpm/rhc.spec.in +++ b/dist/srpm/rhc.spec.in @@ -39,8 +39,8 @@ Version: @VERSION@ %if 0%{?fedora} %global setup_flags -Dvendor=False %else -%endif %global setup_flags -Dvendor=True +%endif %global common_description %{expand: rhc is a client that registers a system with RHSM and activates the Red Hat yggd @@ -101,8 +101,6 @@ Transition package to support migrating from rhcd to yggd. %undefine _auto_set_build_flags export %gomodulesmode %{?gobuilddir:export GOPATH="%{gobuilddir}:${GOPATH:+${GOPATH}:}%{?gopath}"} -ls -pwd %meson %setup_flags "-Dgobuildflags=[%(echo %{expand:%gocompilerflags} | sed -e s/"^"/"'"/ -e s/" "/"', '"/g -e s/"$"/"'"/), '-tags', '"rpm_crashtraceback\ ${BUILDTAGS:-}"', '-a', '-v', '-x']" -Dgoldflags='%{?currentgoldflags} -B 0x%(head -c20 /dev/urandom|od -An -tx1|tr -d " \n") -compressdwarf=false -linkmode=external -extldflags "%{build_ldflags} %{?__golang_extldflags}"' %meson_build