.gitignore

@@ -1,7 +1,2 @@
-/go-rpm-macros-3.0.8.tar.gz
+SOURCES/go-rpm-macros-3.6.0.tar.gz
-/go-rpm-macros-3.0.9.tar.gz
+SOURCES/golist-0.10.4.tar.gz
-/golist-0.10.1.tar.gz
-/go-rpm-macros-3.2.0.tar.gz
-/go-rpm-macros-3.6.0.tar.gz
-/golist-0.10.4.tar.gz
-/golist-0.10.4-vendor.tar.xz

.go-rpm-macros.metadata

@@ -0,0 +1,2 @@
+9db262bd1b5acd1c3490d55b839819a878e6659c SOURCES/go-rpm-macros-3.6.0.tar.gz
+4a105131658d029fe0b2d312b078a056748af2b4 SOURCES/golist-0.10.4.tar.gz

README.md

@@ -1,3 +0,0 @@
-# go-rpm-macros
-
-The go-rpm-macros package

SPECS/go-rpm-macros.spec

@@ -37,7 +37,7 @@ Version:   3.6.0
 ExclusiveArch: %{golang_arches} %{gccgo_arches}
 
 Name:      go-rpm-macros
-Release:   11%{?dist}
+Release:   7%{?dist}
 Summary:   Build-stage rpm automation for Go packages
 
 License:   GPLv3+
@@ -45,11 +45,6 @@ URL:       %{forgeurl}
 Source0:   %{forgesource}
 %if 0%{?bundle_golist}
 Source1:   https://pagure.io/golist/archive/v%{golist_version}/golist-%{golist_version}.tar.gz
-# vendored dependency tarball, to create:
-# tar xf golist-%%{golist_version}.tar.gz ; pushd golist-%%{golist_version} ; \
-# go mod init %%{golist_goipath} && go mod tidy && go mod vendor && \
-# tar Jcf ../golist-%%{golist_version}-vendor.tar.xz go.mod go.sum vendor/ ; popd
-Source2:   golist-%{golist_version}-vendor.tar.xz
 %endif
 
 Requires:  go-srpm-macros = %{version}-%{release}
@@ -76,6 +71,10 @@ Provides:  compiler(go-compiler) = 1
 Obsoletes: go-compilers-gcc-go-compiler < %{version}-%{release}
 %endif
 
+# Replace golang-github-urfave-cli with a minimal
+# command line parser backend to bootstrap golist
+# without dependencies.
+Patch1: golist-bootstrap-cli-no-vendor.patch
 # Add libexec to PATH in order to launch golist in every script
 Patch2: 0001-Add-libexec-to-path-for-EPEL9-golist.patch
 
@@ -144,21 +143,22 @@ done
 # unpack golist and patch
 %if 0%{?bundle_golist}
 # Add libexec to PATH
-%patch -P 2 -p1
+%patch2 -p1
 tar -xf %{SOURCE1}
-tar -C %{golist_builddir} -xf %{SOURCE2}
 pushd %{golist_builddir}
+%patch1 -p1
 popd
 cp %{golist_builddir}/LICENSE LICENSE-golist
 %endif
 
-%patch -P 3 -p1
+%patch3 -p1
-%patch -P 4 -p1
+%patch4 -p1
 
 %build
 # build golist
 %if 0%{?bundle_golist}
 pushd %{golist_builddir}
+go mod init %{golist_goipath} && go mod tidy
 for cmd in cmd/* ; do
   %gobuild -o bin/$(basename $cmd) ./$cmd
 done
@@ -226,7 +226,7 @@ sed -i "s,golist ,%{golist_execdir}/golist ,g" \
 %files
 %license LICENSE.txt
 %if %{defined bundle_golist}
-%license LICENSE-golist %{golist_builddir}/vendor/modules.txt
+%license LICENSE-golist
 %endif
 %doc README.md
 %{_bindir}/*
@@ -263,25 +263,6 @@ sed -i "s,golist ,%{golist_execdir}/golist ,g" \
 %{_rpmluadir}/fedora/srpm/*.lua
 
 %changelog
-* Tue Apr 15 2025 Alejandro Sáez <asm@redhat.com> - 3.6.0-11
-- Bump release for el9 to avoid clash with el9_6 build
-- Related: RHEL-86067
-- Related: RHEL-7366
-
-* Fri Apr 11 2025 Alejandro Sáez <asm@redhat.com> - 3.6.0-10
-- Fix malformed patch macros
-- Related: RHEL-86067
-- Related: RHEL-7366
-
-* Fri Apr 04 2025 Alejandro Sáez <asm@redhat.com> - 3.6.0-9
-- Add patches back again
-- Resolves: RHEL-86067
-- Related: RHEL-7366
-
-* Thu Apr 03 2025 Alejandro Sáez <asm@redhat.com> - 3.6.0-8
-- Add full golist implementation
-- Resolves: RHEL-7366
-
 * Wed Nov 13 2024 Alejandro Sáez <asm@redhat.com>
 - Revert go-rpm-templates to noarch
 - Resolves: RHEL-67300

gating.yaml

@@ -1,6 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-9
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}

sources

@@ -1,3 +0,0 @@
-SHA512 (go-rpm-macros-3.6.0.tar.gz) = 904406180a1bedb70dd0bacc3794dee7f1ff8e4329230750ef903338f22c2beb995e23f1d647191a4e094860b31933ae7b3acfa35d6ca67aed8c591bdd45c3bb
-SHA512 (golist-0.10.4.tar.gz) = 81fc9cdc4cb0fa1b78ade56c60cb2ac0070dcb11130a333e61053a266e2312b03e64a6705415d6d20883ae4f8cd0be57722c93835c3efffdfaeb9330f4cc12ea
-SHA512 (golist-0.10.4-vendor.tar.xz) = 53efe2d344d5eeb7954dd7c18a1142c67c1e7009b4d34b503372e010a6380a2218bceccff4925b513c8a80a3c3de8290c244d338f1da00c438d00f9affd8b363