change %forge macro with %forgename macro

Support for specifying forge schemes for unrecognized forges was added
in 6bd567d2ea.
This changes the macro name used to define the forge scheme from
`%forge` to `%forgename` to avoid potential namespace conflicts.
6bd567d2ea was never released, so this
should not break any package in the wild.

rpm/lua/fedora/srpm/forge.lua

@@ -109,7 +109,7 @@ local function meta(suffix, verbose, informative, silent)
                       "archivename", "archiveext", "archiveurl",
                       "topdir", "extractdir", "repo", "owner", "namespace",
                       "scm", "tag", "commit", "shortcommit", "branch", "version",
-                      "date", "distprefix", "forge"}, verbose)
+                      "date", "distprefix", "forgename"}, verbose)
   end
   local variables = {
     default = {
@@ -210,10 +210,10 @@ local function meta(suffix, verbose, informative, silent)
            forgeurl = expliciturl
   end
   local forge
-  forgeurl,   forge = idforge(forgeurl, silent, macros["forge" .. suffix])
+  forgeurl,   forge = idforge(forgeurl, silent, macros["forgename" .. suffix])
   if (forge ~= nil) then
     fedora.explicitset("forgeurl" .. suffix, forgeurl, verbose)
-    fedora.explicitset("forge" .. suffix, forge, verbose)
+    fedora.explicitset("forgename" .. suffix, forge, verbose)
     -- Custom processing of quirky forges that can not be handled with simple variables
     if (forge == "github") then
       -- Workaround the way GitHub injects "v"s before some version strings (but not all!)
@@ -333,7 +333,7 @@ local function meta(suffix, verbose, informative, silent)
                       "archivename", "archiveext", "archiveurl",
                       "topdir", "extractdir", "repo", "owner", "namespace",
                       "scm", "shortcommit", "distprefix", "_forgeversionsuffix",
-                      "forge"}, verbose)
+                      "forgename"}, verbose)
   end
   -- Final spec variable summary if the macro was called with -i
   if informative then
@@ -343,7 +343,7 @@ local function meta(suffix, verbose, informative, silent)
                         "topdir", "extractdir", "repo", "owner", "namespace",
                         "scm", "tag", "commit", "shortcommit", "branch", "version",
                         "date", "distprefix", "_forgeversionsuffix",
-                        "forge"}, suffix)
+                        "forgename"}, suffix)
     fedora.echovars({"dist"},"")
     rpm.expand("%{echo:  (snapshot date is either manually supplied or computed once %%{_sourcedir}/%%{archivename" .. suffix .. "}.%%{archiveext" .. suffix .. "} is available)}")
   end

tests/vectors.yaml

@@ -17,7 +17,7 @@ _anchors:
     - extractdir
     - repo
     - scm
-    - forge
+    - forgename
   zeroidx_commit: &zeroidx_commit
     - commit
     - distprefix
@@ -31,7 +31,7 @@ _anchors:
     - extractdir
     - repo
     - scm
-    - forge
+    - forgename
   zeroidx_branch: &zeroidx_branch
     - branch
     - distprefix
@@ -45,7 +45,7 @@ _anchors:
     - extractdir
     - repo
     - scm
-    - forge
+    - forgename
 
 cases:
   - id: smoke
@@ -85,7 +85,7 @@ cases:
       forgesetup: "SETUP -q -n ansible-%{version}\n"
       "forgesetup -z0": "%forgesetup"
       "forgesetup -a": "%forgesetup"
-      forge: github
+      forgename: github
     zero_indexed: *zeroidx
     expected_undefined:
       - distprefix
@@ -109,7 +109,7 @@ cases:
       extractdir: "community.general-%{version}"
       repo: community.general
       scm: git
-      forge: github
+      forgename: github
     zero_indexed: *zeroidx
     expected_undefined:
       - distprefix
@@ -130,7 +130,7 @@ cases:
       repo: ansible
       scm: git
       distprefix: ".git520bb66"
-      forge: github
+      forgename: github
     zero_indexed: *zeroidx_commit
 
   - id: github_forgesource_branch
@@ -148,7 +148,7 @@ cases:
       repo: ansible
       scm: git
       distprefix: ".gitmain"
-      forge: github
+      forgename: github
     zero_indexed: *zeroidx_branch
 
     # Different semantics are used when a date is specified
@@ -170,7 +170,7 @@ cases:
       scm: git
       distprefix: ".20230813git520bb66"
       _forgeversionsuffix0: ".20230813git520bb66"
-      forge: github
+      forgename: github
     zero_indexed: *zeroidx_commit
 
   - id: gitlab_forgesource_simple
@@ -188,7 +188,7 @@ cases:
       extractdir: "fdroidclient-%{version}"
       repo: fdroidclient
       scm: git
-      forge: gitlab
+      forgename: gitlab
     zero_indexed: *zeroidx
     expected_undefined:
       - distprefix
@@ -209,7 +209,7 @@ cases:
       scm: git
       distprefix: ".git9530f51"
       _forgeversionsuffix: ".git9530f51"
-      forge: gitlab
+      forgename: gitlab
     zero_indexed: *zeroidx_commit
 
   - id: test_gitea_simple
@@ -230,7 +230,7 @@ cases:
       extractdir: "%{name}"
       repo: "%{name}"
       scm: git
-      forge: gitea.com
+      forgename: gitea.com
     zero_indexed: *zeroidx
     expected_undefined:
       - distprefix
@@ -252,7 +252,7 @@ cases:
       scm: git
       distprefix: ".gitf5dbac2"
       _forgeversionsuffix: ".gitf5dbac2"
-      forge: gitea.com
+      forgename: gitea.com
     zero_indexed: *zeroidx_commit
 
   - id: test_sourcehut_simple
@@ -271,7 +271,7 @@ cases:
       extractdir: "%{name}-%{version}"
       repo: "%{name}"
       scm: git
-      forge: sourcehut
+      forgename: sourcehut
     zero_indexed: *zeroidx
     expected_undefined:
       - distprefix
@@ -294,7 +294,7 @@ cases:
       scm: git
       distprefix: ".gite124442"
       _forgeversionsuffix: ".gite124442"
-      forge: sourcehut
+      forgename: sourcehut
     zero_indexed: *zeroidx_commit
 
   - id: sourcehut_v_prefix
@@ -319,7 +319,7 @@ cases:
       extractdir: "fedrq-v%{version}"
       repo: fedrq
       scm: git
-      forge: sourcehut
+      forgename: sourcehut
     zero_indexed: *zeroidx
     expected_undefined:
       - distprefix
@@ -427,7 +427,7 @@ cases:
       scm: git
       distprefix: ".git9479d77"
       _forgeversionsuffix: ".git9479d77"
-      forge: bitbucket.org
+      forgename: bitbucket.org
     zero_indexed: *zeroidx_commit
 
   - id: multisource_all
@@ -459,7 +459,7 @@ cases:
       "forgesetup -a": |
         SETUP -q %{forgesetupargs}
         SETUP -q %{forgesetupargs1}
-      forge: github
+      forgename: github
     zero_indexed: *zeroidx
     expected_undefined:
       - distprefix
@@ -529,10 +529,10 @@ cases:
     defines:
       - version: "5.11.1"
         forgeurl: "https://opendev.org/openstack/pbr"
-        forge: "gitea.com"
+        forgename: "gitea.com"
       - version0: "5.11.1"
         forgeurl0: "https://opendev.org/openstack/pbr"
-        forge0: "gitea.com"
+        forgename0: "gitea.com"
     expected:
       forgesource: "https://opendev.org/openstack/pbr/archive/%{version}.tar.gz"
       forgesetupargs: "-n pbr"
@@ -543,7 +543,7 @@ cases:
       extractdir: "pbr"
       repo: "pbr"
       scm: git
-      forge: gitea.com
+      forgename: gitea.com
     zero_indexed: *zeroidx
     expected_undefined:
       - distprefix