From 06e3526e099efcaf37d647c31cf2658871e4802a Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Oct 17 2025 14:31:37 +0000
Subject: manifests: Move exclude to specific variants


Keep exclude config in variants, not in the Fedora specific manifest.

Fixes: a567407 manifests: Fix PackageKit-glib exclude

---

diff --git a/base-atomic.yaml b/base-atomic.yaml
index d9cbbb4..0c01dbb 100644
--- a/base-atomic.yaml
+++ b/base-atomic.yaml
@@ -14,6 +14,10 @@ packages:
   - xdg-desktop-portal
   - xdg-desktop-portal-gtk
 
+# Can only be excluded on variants that do not include GNOME Software
+exclude-packages:
+  - PackageKit-glib
+
 # Kept in the leaf manifest as they are overwritten by Pungi in composes
 repos:
   - fedora-rawhide
diff --git a/budgie-atomic-common.yaml b/budgie-atomic-common.yaml
index a6fd037..b0eee18 100644
--- a/budgie-atomic-common.yaml
+++ b/budgie-atomic-common.yaml
@@ -18,3 +18,5 @@ exclude-packages:
   - tracker-miners
   - localsearch
   - tinysparql
+  # Can only be excluded on variants that do not include GNOME Software
+  - PackageKit-glib
diff --git a/cosmic-atomic-common.yaml b/cosmic-atomic-common.yaml
index 428747e..4d08878 100644
--- a/cosmic-atomic-common.yaml
+++ b/cosmic-atomic-common.yaml
@@ -11,3 +11,7 @@ include:
 packages:
   # Portals for Flatpak
   - xdg-desktop-portal-gtk
+
+# Can only be excluded on variants that do not include GNOME Software
+exclude-packages:
+  - PackageKit-glib
diff --git a/fedora.yaml b/fedora.yaml
index 3b6d173..2723f2e 100644
--- a/fedora.yaml
+++ b/fedora.yaml
@@ -1,4 +1,9 @@
-# All Fedora specific packages and configuration
+# Fedora specific packages and configuration
+
+# Note that this manifest must be additive only to allow downstream users to
+# reuse the manifests in this project, excluding this one by setting the
+# "distro" variable to their own value.
+
 packages:
   - fedora-bookmarks
   - fedora-chromium-config
@@ -48,11 +53,6 @@ conditional-include:
     include:
       packages:
         - fedora-repos-ostree
-  # Can only be excluded on variants that do not include GNOME Software
-  - if: variant != "silverblue"
-    include:
-      exclude-packages:
-        - PackageKit-glib
 
 # Remove the Google Chrome repo from the list of Fedora Third Party enabled
 # repos. Workaround for https://github.com/coreos/rpm-ostree/issues/5494
diff --git a/kinoite-shared.yaml b/kinoite-shared.yaml
index 8227797..1a98dd5 100644
--- a/kinoite-shared.yaml
+++ b/kinoite-shared.yaml
@@ -33,6 +33,8 @@ exclude-packages:
   - plasma-workspace-x11
   # Exclude mariadb server tools that bring in Perl
   - mariadb-server-utils
+  # Can only be excluded on variants that do not include GNOME Software
+  - PackageKit-glib
 
 # Kinoite specific workarounds and configuration
 postprocess:
diff --git a/sway-atomic-common.yaml b/sway-atomic-common.yaml
index 79bb0e8..e74a882 100644
--- a/sway-atomic-common.yaml
+++ b/sway-atomic-common.yaml
@@ -21,3 +21,5 @@ exclude-packages:
   - tracker-miners
   - localsearch
   - tinysparql
+  # Can only be excluded on variants that do not include GNOME Software
+  - PackageKit-glib