[rpms/fedora-release] f45: Split tag-varying bit of dist into %%{distcore}

[rpms/fedora-release] f45: Split tag-varying bit of dist into %%{distcore}

[Owen W. Taylor]

            A new commit has been pushed.

            Repo   : rpms/fedora-release
            Branch : f45
            Commit : b59c2ded44149899e65d6e3ca271325140ad585b
            Author : Owen W. Taylor <otaylor@fishsoup.net>
            Date   : 2023-08-17T06:49:03-04:00
            Stats  : +3/-2 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedora-release/c/b59c2ded44149899e65d6e3ca271325140ad585b?branch=f45

            Log:
            Split tag-varying bit of dist into %%{distcore}

To avoid repeating much of the complexity of the %%dist definition for
ELN, f<n>-flatpak-app-build, f<n>-flatpak-runtime-build, split out a
%%{distcore} part that can more easily be redefined.

---
diff --git a/fedora-release.spec b/fedora-release.spec
index bd2dd3b..94c4ffc 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -1572,12 +1572,13 @@ cat >> %{buildroot}%{_rpmconfigdir}/macros.d/macros.dist << EOF
 %%el%{rhel_dist_version}                1
 # Although eln is set in koji tags, we put it in the macros.dist file for local and mock builds.
 %%eln              %{eln}
-%%dist                %%{!?distprefix0:%%{?distprefix}}%%{expand:%%{lua:for i=0,9999 do print("%%{?distprefix" .. i .."}") end}}.el%%{eln}%%{?with_bootstrap:%{__bootstrap}}
+%%distcore            .el%%{eln}
 %else
 %%fedora              %{dist_version}
 %%fc%{dist_version}                1
-%%dist                %%{!?distprefix0:%%{?distprefix}}%%{expand:%%{lua:for i=0,9999 do print("%%{?distprefix" .. i .."}") end}}.fc%%{fedora}%%{?with_bootstrap:%{__bootstrap}}
+%%distcore            .fc%%{fedora}
 %endif
+%%dist                %%{!?distprefix0:%%{?distprefix}}%%{expand:%%{lua:for i=0,9999 do print("%%{?distprefix" .. i .."}") end}}%%{distcore}{?with_bootstrap:%{__bootstrap}}
 %%dist_vendor         %{dist_vendor}
 %%dist_name           %{dist_name}
 %%dist_home_url       %{dist_home_url}