From 56aa9c9252e526cebbadd4212623b6a508eb5d26 Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor@fishsoup.net>
Date: Sep 07 2023 06:59:04 +0000
Subject: make-koji-release-tags: Set %distcore for flatpak build tags


Previously, we were setting the .dist macro in flatpak-runtime-config;
do it in the build tag configuration to match ELN and for greater
flexibility: in particular this allows

This depends on a fedora-release change to define %dist in terms of
%distcore:
https://src.fedoraproject.org/rpms/fedora-release/pull-request/275

---

diff --git a/scripts/branching/make-koji-release-tags b/scripts/branching/make-koji-release-tags
index 1ca36f1..782702e 100755
--- a/scripts/branching/make-koji-release-tags
+++ b/scripts/branching/make-koji-release-tags
@@ -167,12 +167,16 @@ flatpak_pkgs=$(koji list-pkgs --quiet --tag="f${old_release}-flatpak" | awk '{ p
 "${KOJICLI}" add-group-pkg "f${release}-flatpak-container-build" flatpak-build flatpak-module-tools dnf tar
 
 # The repository for build dependencies when building runtime RPMs
-"${KOJICLI}" add-tag "f${release}-flatpak-runtime-build" --arches="${FLATPAK_ARCHES}"
+"${KOJICLI}" add-tag "f${release}-flatpak-runtime-build" \
+    --arches="${FLATPAK_ARCHES}" \
+    -x rpm.macro.distcore='.fc%{fedora}runtime'
 "${KOJICLI}" add-tag-inheritance "f${release}-flatpak-runtime-build" "f${release}-flatpak-runtime" --priority=0
 "${KOJICLI}" add-tag-inheritance "f${release}-flatpak-runtime-build" "f${release}-build" --priority=10
 
 # The repository for build dependencies when building application RPMs
-"${KOJICLI}" add-tag "f${release}-flatpak-app-build" --arches="${FLATPAK_ARCHES}"
+"${KOJICLI}" add-tag "f${release}-flatpak-app-build" \
+    --arches="${FLATPAK_ARCHES}" \
+    -x rpm.macro.distcore='.fc%{fedora}app'
 "${KOJICLI}" add-tag-inheritance "f${release}-flatpak-app-build" "f${release}-flatpak-app" --priority=0
 "${KOJICLI}" add-tag-inheritance "f${release}-flatpak-app-build" "f${release}-flatpak-runtime" --priority=10
 "${KOJICLI}" add-tag-inheritance "f${release}-flatpak-app-build" "f${release}-build" --priority=20