From bbbee578c9e781087acd985cb2f56c0086b4dfe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <tim@siosm.fr>
Date: Thu, 30 Mar 2023 18:10:00 +0200
Subject: [PATCH] Kinoite: ark & kwrite come from the kde-desktop group

We now directly pick the default apps to include via the kde-desktop
comps group.

See: https://pagure.io/fedora-comps/pull-request/824
---
 comps-sync-exclude-list.yml | 1 -
 fedora-kinoite.yaml         | 3 ---
 kde-desktop-pkgs.yaml       | 2 ++
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index c6acc44..3370e07 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -169,7 +169,6 @@ desktop_exclude_list:
     - korganizer
     - kruler
     - ksshaskpass
-    - kwrite
     - libreoffice-kde
     - okular
     # Misc
diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml
index 806b5c2..678f812 100644
--- a/fedora-kinoite.yaml
+++ b/fedora-kinoite.yaml
@@ -13,13 +13,10 @@ packages:
   - xorg-x11-server-Xwayland
   # Portals for Flatpak
   - xdg-desktop-portal-kde
-  # Provide an archive manager by default
-  - ark
   # Keep some basic apps installed until we have Flatpaks available
   # See https://pagure.io/fedora-kde/SIG/issue/13
   - gwenview
   - kcalc
-  - kwrite
   - okular
   # Install some minor optional tools for KInfoCenter
   - vulkan-tools
diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml
index 1cd594d..ad50fdc 100644
--- a/kde-desktop-pkgs.yaml
+++ b/kde-desktop-pkgs.yaml
@@ -2,6 +2,7 @@
 include: fedora-common-ostree.yaml
 packages:
   - NetworkManager-config-connectivity-fedora
+  - ark
   - bluedevil
   - breeze-icon-theme
   - dolphin
@@ -36,6 +37,7 @@ packages:
   - kscreenlocker
   - kwalletmanager5
   - kwin
+  - kwrite
   - libappindicator-gtk3
   - pam-kwallet
   - phonon-qt5-backend-gstreamer