From 7f47ef115f6bf16d7dfa7669f88d09e3f33c5e49 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mar 29 2021 12:16:58 +0000 Subject: [PATCH 1/2] Add f34 branched dataset and update the default --- diff --git a/config/fedora.yaml b/config/fedora.yaml index f7232b9..13704c4 100644 --- a/config/fedora.yaml +++ b/config/fedora.yaml @@ -2,7 +2,7 @@ document: fedmod-configuration version: 1 data: options: - dataset: f33 + dataset: f34 datasets: templates: fedora-base: @@ -68,11 +68,13 @@ data: template: fedora-stable f33: template: fedora-stable + f34: + template: fedora-branched rawhide: dataset-regex: rawhide platform-module: # nothing to match -> hardcode - stream-template: f34 + stream-template: f35 template: fedora-base repositories: fedora: From a071ef5d36f26d7771b09a21c3ef88ab2e9215b7 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mar 29 2021 12:19:24 +0000 Subject: [PATCH 2/2] rpm2flatpak: Use 'stable' branch rather than 'master' All flatpak 'master' branches were renamed to 'stable' in Fedora dist git. --- diff --git a/_fedmod/flatpak_generator.py b/_fedmod/flatpak_generator.py index cbbe87c..d2f1bb6 100644 --- a/_fedmod/flatpak_generator.py +++ b/_fedmod/flatpak_generator.py @@ -172,7 +172,7 @@ class FlatpakGenerator(ModuleGenerator): app_id = manifest['id'] yml = NoSortMapping({ 'compose': { - 'modules': [self.pkgs[0] + ':master'], + 'modules': [self.pkgs[0] + ':stable'], }, 'flatpak': NoSortMapping({ 'id': app_id,