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

@@ -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

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

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
 

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

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

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
 

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

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

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: