From ef67350732161716d6f62500fcfeeec1a569a2a0 Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor@fishsoup.net>
Date: Aug 09 2018 11:29:35 +0000
Subject: [PATCH 1/2] rpm2flatpak: reference the master stream, not the stable stream


Current plans are that people will maintain the stable version of their
Flatpak on the master branch.

---

diff --git a/src/_fedmod/flatpak_generator.py b/src/_fedmod/flatpak_generator.py
index 521be44..733d55f 100644
--- a/src/_fedmod/flatpak_generator.py
+++ b/src/_fedmod/flatpak_generator.py
@@ -66,7 +66,7 @@ class FlatpakGenerator(ModuleGenerator):
         container_yaml = dedent(f'''\
             compose:
                 modules:
-                    - {pkg}:stable
+                    - {pkg}:master
             flatpak:
                 # Derived from the project's domain name
                 id: org.example.MyApp

From 588a24f56d256a6cbcc529e7a5d0664007c42f5f Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor@fishsoup.net>
Date: Aug 09 2018 11:29:35 +0000
Subject: [PATCH 2/2] For Flatpaks, default components to the F28 branch


We are generating the component list for a Flatpak based on the F28
repodata and building against the F28 platform, so it makes most sense
to start off specifying the F28 version of the application and
dependencies - the module maintainer can upgrade to the master branch
as desired.

---

diff --git a/src/_fedmod/flatpak_generator.py b/src/_fedmod/flatpak_generator.py
index 733d55f..8129c88 100644
--- a/src/_fedmod/flatpak_generator.py
+++ b/src/_fedmod/flatpak_generator.py
@@ -16,6 +16,7 @@ from . import _depchase
 
 
 FLATPAK_RUNTIME_STREAM = 'f28'
+DEFAULT_RPM_BRANCH = 'f28'
 
 
 def _get_runtime_packages():
@@ -33,6 +34,7 @@ def _get_runtime_packages():
 class FlatpakGenerator(ModuleGenerator):
     def __init__(self, pkg):
         super().__init__([pkg])
+        self.rpm_branch = DEFAULT_RPM_BRANCH
 
     def _calculate_dependencies(self):
         pkg = self.pkgs[0]
diff --git a/src/_fedmod/module_generator.py b/src/_fedmod/module_generator.py
index cf7aa54..37bbd1b 100644
--- a/src/_fedmod/module_generator.py
+++ b/src/_fedmod/module_generator.py
@@ -32,6 +32,7 @@ class ModuleGenerator(object):
         self.pkgs = pkgs
         self.mmd = Modulemd.Module(mdversion=2)
         self._pool = _depchase.make_pool("x86_64")
+        self.rpm_branch = None
 
     def _calculate_dependencies(self):
         pkgs = self.pkgs
@@ -92,6 +93,8 @@ class ModuleGenerator(object):
             component = Modulemd.ComponentRpm(name=pkg,
                                               rationale="Package in api",
                                               buildorder=self._get_build_order(pkg))
+            if self.rpm_branch is not None:
+                component.props.ref = self.rpm_branch
             self.mmd.add_rpm_component(component)
 
         # Declare module level dependencies
@@ -105,6 +108,8 @@ class ModuleGenerator(object):
             component = Modulemd.ComponentRpm(name=pkg,
                                               rationale="Runtime dependencies",
                                               buildorder=self._get_build_order(pkg))
+            if self.rpm_branch is not None:
+                component.props.ref = self.rpm_branch
             self.mmd.add_rpm_component(component)
 
         # TODO: Always set content licenses appropriately