[flatpaks/flatpak-runtime] f45: Make the branch of flatpak-rpm-macros / flatpak-runtime-config configurable

[flatpaks/flatpak-runtime] f45: Make the branch of flatpak-rpm-macros / flatpak-runtime-config configurable

[Owen W. Taylor]

A new commit has been pushed.

Repo   : flatpaks/flatpak-runtime
Branch : f45
Commit : a41388305461bafb81ebfc8792ad258a04dbec8c
Author : Owen W. Taylor <otaylor@fishsoup.net>
Date   : 2020-03-20T21:51:58+01:00
Stats  : +9/-6 in 4 file(s)
URL    : https://src.fedoraproject.org/flatpaks/flatpak-runtime/c/a41388305461bafb81ebfc8792ad258a04dbec8c?branch=f45

Log:
Make the branch of flatpak-rpm-macros / flatpak-runtime-config configurable

---
diff --git a/flatpak-runtime-baseonly.in.yaml b/flatpak-runtime-baseonly.in.yaml
index b0558f2..0d82f23 100644
--- a/flatpak-runtime-baseonly.in.yaml
+++ b/flatpak-runtime-baseonly.in.yaml
@@ -27,10 +27,10 @@ data:
         rpms:
             flatpak-rpm-macros:
                 rationale: Set up build root for flatpak RPMS
-                ref: master
+                ref: @RPM_BRANCH@
             flatpak-runtime-config:
                 rationale: Runtime configuration files
-                ref: master
+                ref: @RPM_BRANCH@
     xmd:
         # This is used when building applications against this module so that
         # the resulting Flatpak will embed a reference to the correct runtime

diff --git a/flatpak-runtime.in.yaml b/flatpak-runtime.in.yaml
index dcb7592..7cbf91f 100644
--- a/flatpak-runtime.in.yaml
+++ b/flatpak-runtime.in.yaml
@@ -34,10 +34,10 @@ data:
         rpms:
             flatpak-rpm-macros:
                 rationale: Set up build root for flatpak RPMS
-                ref: master
+                ref: @RPM_BRANCH@
             flatpak-runtime-config:
                 rationale: Runtime configuration files
-                ref: master
+                ref: @RPM_BRANCH@
     xmd:
         # This is used when building applications against this module so that
         # the resulting Flatpak will embed a reference to the correct runtime

diff --git a/tools/generate-modulemd.py b/tools/generate-modulemd.py
index a4f99dc..85e80b7 100755
--- a/tools/generate-modulemd.py
+++ b/tools/generate-modulemd.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 import sys
 from yaml_utils import ordered_load, ordered_dump
-from util import ID_PREFIX, STREAM, BASEONLY
+from util import ID_PREFIX, STREAM, RPM_BRANCH, BASEONLY
 
 template = 'flatpak-runtime-baseonly.in.yaml' if BASEONLY else 'flatpak-runtime.in.yaml'
 
@@ -10,7 +10,8 @@ with open(template) as f:
 
 modulemd_string = modulemd_string \
     .replace('@ID_PREFIX@', ID_PREFIX) \
-    .replace('@STREAM@', STREAM)
+    .replace('@STREAM@', STREAM) \
+    .replace('@RPM_BRANCH@', RPM_BRANCH)
 
 modulemd = ordered_load(modulemd_string)
 

diff --git a/tools/util.py b/tools/util.py
index 7bec455..1be2db2 100644
--- a/tools/util.py
+++ b/tools/util.py
@@ -9,6 +9,8 @@ import xml.sax
 
 STREAM = 'f30'
 ID_PREFIX = 'org.fedoraproject'
+# branch of flatpak-rpm-macros and flatpak-runtime-config
+RPM_BRANCH = 'master'
 DATASET_ARG = '--dataset=f30'
 # If this is True, then we'll use the "base" profiles (freedesktop-based) as the main profiles
 BASEONLY = False