diff --git a/add-gobuild-and-gotest.patch b/add-gobuild-and-gotest.patch index d43df60..81c3fda 100644 --- a/add-gobuild-and-gotest.patch +++ b/add-gobuild-and-gotest.patch @@ -25,7 +25,7 @@ index a46f81f..05cd6c9 100644 +# Define commands for building +# BUILD_ID can be generated for golang build no matter of debuginfo +%gobuild(o:) \ -+GOPPC64=power9 GOAMD64=v2 CGO_CPPFLAGS="-D_FORTIFY_SOURCE=2 -fstack-protector-all" go build -compiler gc -buildmode pie '-tags=rpm_crashtraceback libtrust_openssl {GO_BUILDTAGS-${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 %{?**};\ ++GOPPC64=power9 GOAMD64=v2 CGO_CPPFLAGS="-D_FORTIFY_SOURCE=2 -fstack-protector-all" go build -compiler gc -buildmode pie -tags="rpm_crashtraceback libtrust_openssl ${GO_BUILDTAGS-${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 %{?**};\ + +# Define commands for testing +%gotest() go test -compiler gc -ldflags "${LDFLAGS:-}" %{?**}; diff --git a/go-rpm-macros.spec b/go-rpm-macros.spec index c2912ff..f9f2147 100644 --- a/go-rpm-macros.spec +++ b/go-rpm-macros.spec @@ -36,7 +36,7 @@ Version: 3.6.0 ExclusiveArch: %{golang_arches} %{gccgo_arches} Name: go-rpm-macros -Release: 2%{?dist} +Release: 3%{?dist} Summary: Build-stage rpm automation for Go packages License: GPLv3+ @@ -257,6 +257,10 @@ install -m 0755 -vp %{golist_builddir}/bin/* %{buildroot}%{golist_execdir}/ %{_spectemplatedir}/*.spec %changelog +* Wed Jul 31 2024 Alejandro Sáez - 3.6.0-3 +- Fix typo in add-gobuild-and-gotest.patch +- Resolves: RHEL-7437 + * Wed Jul 31 2024 Alejandro Sáez - 3.6.0-2 - Remove rpm.isdefined function - Resolves: RHEL-51368