From e414f58612952945e67ad75bbd123b74b2ba4226 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <tim@siosm.fr>
Date: Mon, 11 Jan 2021 19:25:52 +0100
Subject: [PATCH] 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 will use the Fedora generic
release package (or the corresponding Spin release package) with the
ostree counting and desktop sub packages to enable those features by
default.
---
 fedora-base.yaml          | 4 ++++
 fedora-common-ostree.yaml | 1 -
 fedora-deepin.yaml        | 4 ++++
 fedora-kinoite.yaml       | 1 +
 fedora-lxqt.yaml          | 4 ++++
 fedora-mate.yaml          | 5 ++++-
 fedora-pantheon.yaml      | 4 ++++
 fedora-silverblue.yaml    | 1 +
 fedora-xfce.yaml          | 4 ++++
 9 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/fedora-base.yaml b/fedora-base.yaml
index ed3c178..55a4c75 100644
--- a/fedora-base.yaml
+++ b/fedora-base.yaml
@@ -5,6 +5,10 @@ rojig:
   summary: "Fedora base image for alternative DE"
   license: MIT
 packages:
+  # Generic release packages for desktop variants and counting
+  - fedora-release
+  - fedora-release-ostree-desktop
+  - fedora-release-ostree-counting
   # XWayland support
   - xorg-x11-server-Xwayland
   # Portals for Flatpak
diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml
index 22aa218..66a892c 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..ff49255 100644
--- a/fedora-deepin.yaml
+++ b/fedora-deepin.yaml
@@ -5,6 +5,10 @@ rojig:
   summary: "Fedora Deepin base image"
   license: MIT
 packages:
+  # Generic release packages for desktop variants and counting
+  - fedora-release
+  - fedora-release-ostree-desktop
+  - fedora-release-ostree-counting
   # GUI to manage updates & Flatpaks
   - gnome-software
 
diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml
index 45f93e1..d709c52 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..5c5e713 100644
--- a/fedora-lxqt.yaml
+++ b/fedora-lxqt.yaml
@@ -5,6 +5,10 @@ rojig:
   summary: "Fedora LXQt base image"
   license: MIT
 packages:
+  # Generic release packages for desktop variants and counting
+  - fedora-release
+  - fedora-release-ostree-desktop
+  - fedora-release-ostree-counting
   - libqtxdg
   # Portals for Flatpak
   - xdg-desktop-portal-kde
diff --git a/fedora-mate.yaml b/fedora-mate.yaml
index 6080915..26091d5 100644
--- a/fedora-mate.yaml
+++ b/fedora-mate.yaml
@@ -4,8 +4,11 @@ rojig:
   name: fedora-mate
   summary: "Fedora Mate base image"
   license: MIT
-
 packages:
+  - fedora-release-matecompiz
+  # Generic release sub packages for desktop variants and counting
+  - fedora-release-ostree-desktop
+  - fedora-release-ostree-counting
   # Portals for Flatpak
   - xdg-desktop-portal-gtk
 
diff --git a/fedora-pantheon.yaml b/fedora-pantheon.yaml
index 31327f4..b887b98 100644
--- a/fedora-pantheon.yaml
+++ b/fedora-pantheon.yaml
@@ -5,6 +5,10 @@ rojig:
   summary: "Fedora Pantheon base image"
   license: MIT
 packages:
+  # Generic release packages for desktop variants and counting
+  - fedora-release
+  - fedora-release-ostree-desktop
+  - fedora-release-ostree-counting
 
 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..33ac52e 100644
--- a/fedora-xfce.yaml
+++ b/fedora-xfce.yaml
@@ -5,6 +5,10 @@ rojig:
   summary: "Fedora XFCE base image"
   license: MIT
 packages:
+  - fedora-release-xfce
+  # Generic release sub packages for desktop variants and counting
+  - fedora-release-ostree-desktop
+  - fedora-release-ostree-counting
   # Portals for Flatpak
   - xdg-desktop-portal-gtk
 repos: