Merge and update to 3.3.0-1

.gitignore

@@ -0,0 +1 @@
+SOURCES/go-rpm-macros-epel9-3.3.0.tar.gz

.go-rpm-macros-epel.metadata

@@ -0,0 +1 @@
+f55c10d8b85fec7b506aedeef816d5b702291304  SOURCES/go-rpm-macros-epel9-3.3.0.tar.gz

SPECS/go-rpm-macros-epel.spec

@@ -4,38 +4,31 @@
 # SPDX-FileCopyrightText: 2022 Maxwell G <gotmax@e.email>
 # SPDX-FileCopyrightText: Fedora Project Authors
 
-# Pagure does not support downloading raw files of tags.
+%global forgeurl https://pagure.io/go-rpm-macros
-# Referencing the commit hash is necessary
-%dnl %global upstream_version 3.2.0
-%global upstream_version c32fbbd25bbcedee8c0b898d3653255b18a0d30e
 
 Name:           go-rpm-macros-epel
-Version:        1
+Version:        3.3.0
-Release:        8%{?dist}
+%global tag epel9-%{version}
+%global distprefix %{nil}
+%forgemeta
+Release:        1%{?dist}
 Summary:        Backport of certain Fedora Go RPM macros to EPEL
 
 License:        GPL-3.0-or-later
-URL:            https://pagure.io/go-rpm-macros
+URL:            %{forgeurl}
-Source:         macros.zzz-go-rpm-macros-epel
+Source0:        %{forgesource}
-Source:         macros.zzz-go-srpm-macros-epel
+# Downstream README
-Source:         https://pagure.io/go-rpm-macros/raw/%{upstream_version}/f/rpm/go_mod_vendor.prov
+Source1:        README.md
-Source:         https://pagure.io/go-rpm-macros/raw/%{upstream_version}/f/rpm/fileattrs/go_mod_vendor.attr
-
-# Upstream go-rpm-macros README
-Source:         https://pagure.io/go-rpm-macros/raw/%{upstream_version}/f/README.md#/README.upstream.md
-# README specific to the backports in this package.
-Source:         README.md
-Source:         https://pagure.io/go-rpm-macros/raw/%{upstream_version}/f/LICENSE.txt
 # golist-symlink subpackage license
-Source:         https://github.com/spdx/license-list-data/raw/master/text/Unlicense.txt
+Source2:        https://github.com/spdx/license-list-data/raw/master/text/Unlicense.txt
 
-# Require RHEL's macros. We BuildRequire the macros to make sure they still
+# Require RHEL's macros. We read macros from go-srpm-macros in the specfile.
-# install and to allow us run testing in %check if we decide to later.
+BuildRequires:  go-srpm-macros
 BuildRequires:  go-rpm-macros
 Requires:       go-rpm-macros
 
 Requires:       go-srpm-macros-epel = %{version}-%{release}
-Requires:       /usr/bin/golist
+Requires:       go-rpm-macros-golist-symlink = %{version}-%{release}
 
 %description
 go-rpm-macros-epel contains backports of certain Go RPM macros from Fedora.
@@ -46,7 +39,6 @@ Summary:        Backport of certain Go SRPM macros from Fedora
 BuildArch:      noarch
 # Explicitly Require go-srpm-macros from RHEL even though they are already part
 # of the buildroot. We import its Lua.
-BuildRequires:  go-srpm-macros
 Requires:       go-srpm-macros
 # Pull in go-rpm-macros-epel if go-rpm-macros is installed.
 Requires:       (go-rpm-macros-epel if go-rpm-macros)
@@ -74,16 +66,18 @@ packaged as golist.
 
 
 %prep
-cp -a %{sources} .
+%autosetup -p1 %{forgesetupargs}
+mv README.md README.upstream.md
+cp %{S:1} %{S:2} .
+%writevars -f rpm/macros.d/macros.zzz-go-srpm-macros-epel golang_arches golang_arches_future gccgo_arches gopath
 
 
 %install
 # Install macros and lua
-install -Dpm 0644 macros.* -t %{buildroot}%{_rpmmacrodir}
+install -Dpm 0644 rpm/macros.d/macros.* -t %{buildroot}%{_rpmmacrodir}
+install -Dpm 0644 rpm/lua/rpm/*.lua -t %{buildroot}%{_rpmluadir}/fedora/rpm
+install -Dpm 0644 rpm/lua/srpm/*.lua -t %{buildroot}%{_rpmluadir}/fedora/srpm
 
-# Install go_mod_vendor generator
-install -Dpm 0644 go_mod_vendor.attr -t %{buildroot}%{_rpmconfigdir}/fileattrs
-install -Dpm 0755 go_mod_vendor.prov -t %{buildroot}%{_rpmconfigdir}
 
 # Create symlink for golist-symlink subpackage
 mkdir %{buildroot}%{_bindir}
@@ -98,14 +92,14 @@ install -Dpm 0644 LICENSE.txt \
 %ifarch %{go_arches}
 %files
 %{_rpmmacrodir}/macros.zzz-go-rpm-macros-epel
-%{_rpmconfigdir}/go_mod_vendor.prov
+%{_rpmluadir}/fedora/rpm/go_epel.lua
-%{_rpmconfigdir}/fileattrs/go_mod_vendor.attr
 %endif
 
 %files -n       go-srpm-macros-epel
 %license %{_defaultlicensedir}/go-rpm-macros-epel
 %doc %{_docdir}/go-rpm-macros-epel
 %{_rpmmacrodir}/macros.zzz-go-srpm-macros-epel
+%{_rpmluadir}/fedora/srpm/go_epel.lua
 
 %files -n       go-rpm-macros-golist-symlink
 %doc README.md
@@ -114,6 +108,12 @@ install -Dpm 0644 LICENSE.txt \
 
 
 %changelog
+* Sun Oct 29 2023 Maxwell G <maxwell@gtmx.me> - 3.3.0-1
+- Update to new source git source
+- Remove go_mod_vendor.prov from this package. It's already upstream.
+- Add -L flag to %%gometa and %%gorpmname
+- Add direct dependency on go-rpm-macros-golist-symlink
+
 * Tue Jul 25 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 1-8
 - Rebuilt for MSVSphere 9.2