From a799a97de91023d008518f71bac0a516f93abda5 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Mar 18 2021 19:06:31 +0000
Subject: Switch to per variant fedora-release-* package


Move the fedora-release-* package requirement to each variant treefile
to enable per variant specifc release package. Silverblue keeps its existing
release package and Kinoite gets its own for Fedora 35:
https://fedoraproject.org/wiki/Changes/Fedora_Kinoite

For now, all other unofficial variants are kept on the Silverblue
release package until we create a generic brand for rpm-ostree based
versions of Fedora.

---

diff --git a/fedora-base.yaml b/fedora-base.yaml
index ed3c178..13c75b8 100644
--- a/fedora-base.yaml
+++ b/fedora-base.yaml
@@ -5,6 +5,7 @@ rojig:
   summary: "Fedora base image for alternative DE"
   license: MIT
 packages:
+  - fedora-release-silverblue
   # XWayland support
   - xorg-x11-server-Xwayland
   # Portals for Flatpak
diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml
index 4b07303..0ebf2cb 100644
--- a/fedora-common-ostree.yaml
+++ b/fedora-common-ostree.yaml
@@ -6,7 +6,6 @@ mutate-os-release: "35"
 include: fedora-common-ostree-pkgs.yaml
 
 packages:
-  - fedora-release-silverblue
   - git-core
   - lvm2
   - rpm-ostree
diff --git a/fedora-deepin.yaml b/fedora-deepin.yaml
index a6470e4..caceff0 100644
--- a/fedora-deepin.yaml
+++ b/fedora-deepin.yaml
@@ -5,6 +5,7 @@ rojig:
   summary: "Fedora Deepin base image"
   license: MIT
 packages:
+  - fedora-release-silverblue
   # GUI to manage updates & Flatpaks
   - gnome-software
 
diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml
index 25099f1..9fb48c3 100644
--- a/fedora-kinoite.yaml
+++ b/fedora-kinoite.yaml
@@ -5,6 +5,7 @@ rojig:
   summary: "Fedora Kinoite (KDE) base image"
   license: MIT
 packages:
+  - fedora-release-kinoite
   # Wayland support
   - kwayland-integration
   - kwin-wayland
diff --git a/fedora-lxqt.yaml b/fedora-lxqt.yaml
index 21ecf2b..fee7f3c 100644
--- a/fedora-lxqt.yaml
+++ b/fedora-lxqt.yaml
@@ -5,6 +5,7 @@ rojig:
   summary: "Fedora LXQt base image"
   license: MIT
 packages:
+  - fedora-release-silverblue
   - libqtxdg
   # Portals for Flatpak
   - xdg-desktop-portal-kde
diff --git a/fedora-mate.yaml b/fedora-mate.yaml
index 6080915..eef867b 100644
--- a/fedora-mate.yaml
+++ b/fedora-mate.yaml
@@ -4,8 +4,8 @@ rojig:
   name: fedora-mate
   summary: "Fedora Mate base image"
   license: MIT
-
 packages:
+  - fedora-release-silverblue
   # Portals for Flatpak
   - xdg-desktop-portal-gtk
 
diff --git a/fedora-pantheon.yaml b/fedora-pantheon.yaml
index 31327f4..0a4bc53 100644
--- a/fedora-pantheon.yaml
+++ b/fedora-pantheon.yaml
@@ -5,6 +5,7 @@ rojig:
   summary: "Fedora Pantheon base image"
   license: MIT
 packages:
+  - fedora-release-silverblue
 
 repos:
   - fedora-rawhide
diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml
index fe9b4cb..942ae73 100644
--- a/fedora-silverblue.yaml
+++ b/fedora-silverblue.yaml
@@ -5,6 +5,7 @@ rojig:
   summary: "Fedora Silverblue base image"
   license: MIT
 packages:
+  - fedora-release-silverblue
   - desktop-backgrounds-gnome
   - gnome-shell-extension-background-logo
   - pinentry-gnome3
diff --git a/fedora-xfce.yaml b/fedora-xfce.yaml
index 4655808..6ddfebf 100644
--- a/fedora-xfce.yaml
+++ b/fedora-xfce.yaml
@@ -5,6 +5,7 @@ rojig:
   summary: "Fedora XFCE base image"
   license: MIT
 packages:
+  - fedora-release-silverblue
   # Portals for Flatpak
   - xdg-desktop-portal-gtk
 repos: