| |
@@ -167,12 +167,16 @@
|
| |
"${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
|
| |
otaylor
commented 2 years ago
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