From 167a5f00974677dcc1e74f8ef7438730e45385cd Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Nov 15 2021 19:12:06 +0000
Subject: [PATCH 1/4] fedora-common-ostree: Minor cosmetic fix


---

diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml
index 902ea8f..3fa8ab0 100644
--- a/fedora-common-ostree.yaml
+++ b/fedora-common-ostree.yaml
@@ -46,8 +46,12 @@ ignore-removed-users:
   - root
 ignore-removed-groups:
   - root
-check-passwd: { type: file, filename: passwd }
-check-groups: { type: file, filename: group }
+check-passwd:
+  type: file
+  filename: passwd
+check-groups:
+  type: file
+  filename: group
 
 default_target: graphical.target
 

From 048502f488b917abd6d7bf680f6fb0711d5137a6 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Nov 15 2021 19:12:06 +0000
Subject: [PATCH 2/4] Kinoite: Keep kde-partitionmanager


Re-add kde-partitionmanager to the base image until we have it available
as a Flatpak.

See: https://pagure.io/fedora-kde/SIG/issue/131

---

diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index b369b08..fb3bc22 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -182,7 +182,6 @@ desktop_exclude_list:
     - kcalc
     - kcharselect
     - kcolorchooser
-    - kde-partitionmanager
     - kdnssd
     - kf5-kipi-plugins
     - kfind
diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml
index 760d141..3f21f97 100644
--- a/kde-desktop-pkgs.yaml
+++ b/kde-desktop-pkgs.yaml
@@ -10,6 +10,7 @@ packages:
   - gnome-keyring-pam
   - initial-setup-gui
   - kde-gtk-config
+  - kde-partitionmanager
   - kde-print-manager
   - kde-settings-pulseaudio
   - kdegraphics-thumbnailers

From 61b9bf48022629bd313e4232dad3e16cc3caafe3 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Nov 15 2021 19:14:49 +0000
Subject: [PATCH 3/4] Kinoite: Exclude plasma-pk-updates


plasma-pk-updates is only useful with PackageKit and thus not needed on
Kinoite.

---

diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index fb3bc22..92636ab 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -172,6 +172,7 @@ desktop_exclude_list:
     - abrt-desktop
     - cups-pk-helper
     - dnfdragora
+    - plasma-pk-updates
     # Non-critical apps -> Flatpak
     - akregator
     - cagibi
diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml
index d709c52..895390c 100644
--- a/fedora-kinoite.yaml
+++ b/fedora-kinoite.yaml
@@ -20,6 +20,7 @@ packages:
 exclude-packages:
   - plasma-discover-offline-updates
   - plasma-discover-packagekit
+  - plasma-pk-updates
 
 repos:
   - fedora-rawhide

From 30e1bff8946aa6b2db1f0ecdd353c3e7bd6d0f01 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Nov 15 2021 19:14:49 +0000
Subject: [PATCH 4/4] comps-sync f35 2021-11-15


---

diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml
index 3f21f97..6c48e82 100644
--- a/kde-desktop-pkgs.yaml
+++ b/kde-desktop-pkgs.yaml
@@ -59,4 +59,5 @@ packages:
   - sddm-breeze
   - sddm-kcm
   - spectacle
+  - xdg-desktop-portal-gnome
   - xorg-x11-drv-libinput