From 9cda2a616e6a16693e050c40a33b5a4634d856af Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Mar 30 2023 13:36:17 +0000
Subject: [PATCH 1/9] F39: KDE: Add filelight to kde-desktop group


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

---

diff --git a/comps-f39.xml.in b/comps-f39.xml.in
index 867c974..a98443a 100644
--- a/comps-f39.xml.in
+++ b/comps-f39.xml.in
@@ -3256,6 +3256,7 @@
       <packagereq type="default">dnfdragora</packagereq>
       <packagereq type="default">dolphin</packagereq>
       <packagereq type="default">ffmpegthumbs</packagereq>
+      <packagereq type="default">filelight</packagereq>
       <packagereq type="default">firewall-config</packagereq>
       <packagereq type="default">flatpak-kcm</packagereq>
       <packagereq arch="aarch64,ppc64le,x86_64" type="default">fprintd-pam</packagereq>

From 2653112dcbfd7c023145cfd5d114f3a4dd575da8 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Mar 30 2023 13:36:17 +0000
Subject: [PATCH 2/9] F39: KDE: Move krfb to kde-desktop group


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

---

diff --git a/comps-f39.xml.in b/comps-f39.xml.in
index a98443a..0c9c9c4 100644
--- a/comps-f39.xml.in
+++ b/comps-f39.xml.in
@@ -3226,7 +3226,6 @@
       <packagereq>konversation</packagereq>
       <packagereq>kpat</packagereq>
       <packagereq>krdc</packagereq>
-      <packagereq>krfb</packagereq>
       <packagereq>krusader</packagereq>
       <packagereq>ktorrent</packagereq>
     </packagelist>
@@ -3297,6 +3296,7 @@
       <packagereq type="default">konsole5</packagereq>
       <packagereq arch="aarch64,x86_64" type="default">kontact</packagereq>
       <packagereq arch="aarch64,x86_64" type="default">korganizer</packagereq>
+      <packagereq type="default">krfb</packagereq>
       <packagereq type="default">kscreen</packagereq>
       <packagereq type="default">kscreenlocker</packagereq>
       <packagereq type="default">ksshaskpass</packagereq>

From 411e7f3a24833b3638a45cf35b712a6ad85581f7 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Mar 30 2023 13:36:17 +0000
Subject: [PATCH 3/9] F39: KDE: Split KDE PIM apps into their own group


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

---

diff --git a/comps-f39.xml.in b/comps-f39.xml.in
index 0c9c9c4..ebbc8de 100644
--- a/comps-f39.xml.in
+++ b/comps-f39.xml.in
@@ -3247,7 +3247,6 @@
       <packagereq type="conditional" requires="at-spi2-core">qt-at-spi</packagereq>
       <packagereq type="default">abrt-desktop</packagereq>
       <packagereq type="default">adwaita-gtk2-theme</packagereq>
-      <packagereq arch="aarch64,x86_64" type="default">akregator</packagereq>
       <packagereq type="default">bluedevil</packagereq>
       <packagereq type="default">breeze-icon-theme</packagereq>
       <packagereq type="default">colord-kde</packagereq>
@@ -3263,7 +3262,6 @@
       <packagereq type="default">gnome-keyring-pam</packagereq>
       <packagereq type="default">gwenview</packagereq>
       <packagereq type="default">initial-setup-gui</packagereq>
-      <packagereq arch="aarch64,x86_64" type="default">kaddressbook</packagereq>
       <packagereq type="default">kamera</packagereq>
       <packagereq type="default">kcalc</packagereq>
       <packagereq type="default">kcharselect</packagereq>
@@ -3282,20 +3280,16 @@
       <packagereq type="default">kf5-baloo-file</packagereq>
       <packagereq type="default">kf5-kipi-plugins</packagereq>
       <packagereq type="default">kfind</packagereq>
-      <packagereq arch="aarch64,x86_64" type="default">kgpg</packagereq>
       <packagereq type="default">khelpcenter</packagereq>
       <packagereq type="default">khotkeys</packagereq>
       <packagereq type="default">kinfocenter</packagereq>
       <packagereq type="default">kio-admin</packagereq>
       <packagereq arch="aarch64,x86_64" type="default">kio-gdrive</packagereq>
       <packagereq type="default">kmag</packagereq>
-      <packagereq arch="aarch64,x86_64" type="default">kmail</packagereq>
       <packagereq type="default">kmenuedit</packagereq>
       <packagereq type="default">kmousetool</packagereq>
       <packagereq type="default">kmouth</packagereq>
       <packagereq type="default">konsole5</packagereq>
-      <packagereq arch="aarch64,x86_64" type="default">kontact</packagereq>
-      <packagereq arch="aarch64,x86_64" type="default">korganizer</packagereq>
       <packagereq type="default">krfb</packagereq>
       <packagereq type="default">kscreen</packagereq>
       <packagereq type="default">kscreenlocker</packagereq>
@@ -3396,6 +3390,21 @@
     </packagelist>
   </group>
   <group>
+    <id>kde-pim</id>
+    <_name>KDE PIM</_name>
+    <_description>Personal information management tools for KDE</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq arch="aarch64,x86_64" type="default">akregator</packagereq>
+      <packagereq arch="aarch64,x86_64" type="default">kaddressbook</packagereq>
+      <packagereq arch="aarch64,x86_64" type="default">kgpg</packagereq>
+      <packagereq arch="aarch64,x86_64" type="default">kmail</packagereq>
+      <packagereq arch="aarch64,x86_64" type="default">kontact</packagereq>
+      <packagereq arch="aarch64,x86_64" type="default">korganizer</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>kde-software-development</id>
     <_name>KDE Software Development</_name>
     <_description>Install these packages to develop Qt and KDE graphical applications.</_description>

From 3052e26a70c2cad52399e1b2c6ecd5d52a7b72ec Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Mar 30 2023 13:36:17 +0000
Subject: [PATCH 4/9] F39: KDE: Add kde-pim group to kde-desktop-environment


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

---

diff --git a/comps-f39.xml.in b/comps-f39.xml.in
index ebbc8de..f84bc43 100644
--- a/comps-f39.xml.in
+++ b/comps-f39.xml.in
@@ -6058,6 +6058,7 @@
       <groupid default="true">kde-apps</groupid>
       <groupid>kde-education</groupid>
       <groupid default="true">kde-media</groupid>
+      <groupid default="true">kde-pim</groupid>
       <groupid default="true">libreoffice</groupid>
       <groupid>kde-telepathy</groupid>
       <groupid>3d-printing</groupid>
@@ -6530,6 +6531,7 @@
       <groupid>kde-desktop</groupid>
       <groupid>kde-education</groupid>
       <groupid>kde-media</groupid>
+      <groupid>kde-pim</groupid>
       <groupid>kde-telepathy</groupid>
       <groupid>libreoffice</groupid>
     </grouplist>

From ae4d2e6f455ebc326fad6d37b0a994e2891fe717 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Mar 30 2023 13:36:17 +0000
Subject: [PATCH 5/9] F39: KDE: Split KDE media apps into their own group


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

---

diff --git a/comps-f39.xml.in b/comps-f39.xml.in
index f84bc43..f98717f 100644
--- a/comps-f39.xml.in
+++ b/comps-f39.xml.in
@@ -3218,11 +3218,9 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq>ark</packagereq>
-      <packagereq>digikam</packagereq>
       <packagereq>kde-connect</packagereq>
       <packagereq>kmahjongg</packagereq>
       <packagereq>kmines</packagereq>
-      <packagereq>kolourpaint</packagereq>
       <packagereq>konversation</packagereq>
       <packagereq>kpat</packagereq>
       <packagereq>krdc</packagereq>
@@ -3260,9 +3258,7 @@
       <packagereq arch="aarch64,ppc64le,x86_64" type="default">fprintd-pam</packagereq>
       <packagereq type="default">glibc-all-langpacks</packagereq>
       <packagereq type="default">gnome-keyring-pam</packagereq>
-      <packagereq type="default">gwenview</packagereq>
       <packagereq type="default">initial-setup-gui</packagereq>
-      <packagereq type="default">kamera</packagereq>
       <packagereq type="default">kcalc</packagereq>
       <packagereq type="default">kcharselect</packagereq>
       <packagereq type="default">kde-connect</packagereq>
@@ -3278,7 +3274,6 @@
       <packagereq type="default">kf5-akonadi-server</packagereq>
       <packagereq type="default">kf5-akonadi-server-mysql</packagereq>
       <packagereq type="default">kf5-baloo-file</packagereq>
-      <packagereq type="default">kf5-kipi-plugins</packagereq>
       <packagereq type="default">kfind</packagereq>
       <packagereq type="default">khelpcenter</packagereq>
       <packagereq type="default">khotkeys</packagereq>
@@ -3370,10 +3365,15 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq>dragon</packagereq>
-      <packagereq>elisa-player</packagereq>
-      <packagereq>k3b</packagereq>
-      <packagereq>kamoso</packagereq>
+      <packagereq type="default">digikam</packagereq>
+      <packagereq type="default">dragon</packagereq>
+      <packagereq type="default">elisa-player</packagereq>
+      <packagereq type="default">gwenview</packagereq>
+      <packagereq type="default">k3b</packagereq>
+      <packagereq type="default">kamera</packagereq>
+      <packagereq type="default">kamoso</packagereq>
+      <packagereq type="default">kf5-kipi-plugins</packagereq>
+      <packagereq type="default">kolourpaint</packagereq>
     </packagelist>
   </group>
   <group>

From 33c0507f12e2b342f54d67b6809d78c4ff2b093d Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Mar 30 2023 13:36:17 +0000
Subject: [PATCH 6/9] F39: KDE: Move Ark to the kde-desktop group


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

---

diff --git a/comps-f39.xml.in b/comps-f39.xml.in
index f98717f..fc9b44f 100644
--- a/comps-f39.xml.in
+++ b/comps-f39.xml.in
@@ -3217,7 +3217,6 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq>ark</packagereq>
       <packagereq>kde-connect</packagereq>
       <packagereq>kmahjongg</packagereq>
       <packagereq>kmines</packagereq>
@@ -3245,6 +3244,7 @@
       <packagereq type="conditional" requires="at-spi2-core">qt-at-spi</packagereq>
       <packagereq type="default">abrt-desktop</packagereq>
       <packagereq type="default">adwaita-gtk2-theme</packagereq>
+      <packagereq type="default">ark</packagereq>
       <packagereq type="default">bluedevil</packagereq>
       <packagereq type="default">breeze-icon-theme</packagereq>
       <packagereq type="default">colord-kde</packagereq>

From e91629bc1b916b8f15b37bf3afab51b94c0a53ef Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Mar 30 2023 13:36:17 +0000
Subject: [PATCH 7/9] F39: KDE: Move non-essential apps from kde-desktop to kde-apps


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

---

diff --git a/comps-f39.xml.in b/comps-f39.xml.in
index fc9b44f..c409982 100644
--- a/comps-f39.xml.in
+++ b/comps-f39.xml.in
@@ -3217,14 +3217,18 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
+      <packagereq type="default">kcalc</packagereq>
       <packagereq>kde-connect</packagereq>
+      <packagereq type="default">keditbookmarks</packagereq>
       <packagereq>kmahjongg</packagereq>
       <packagereq>kmines</packagereq>
+      <packagereq type="default">kmouth</packagereq>
       <packagereq>konversation</packagereq>
       <packagereq>kpat</packagereq>
       <packagereq>krdc</packagereq>
       <packagereq>krusader</packagereq>
       <packagereq>ktorrent</packagereq>
+      <packagereq type="default">okular</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3259,7 +3263,6 @@
       <packagereq type="default">glibc-all-langpacks</packagereq>
       <packagereq type="default">gnome-keyring-pam</packagereq>
       <packagereq type="default">initial-setup-gui</packagereq>
-      <packagereq type="default">kcalc</packagereq>
       <packagereq type="default">kcharselect</packagereq>
       <packagereq type="default">kde-connect</packagereq>
       <packagereq type="default">kde-gtk-config</packagereq>
@@ -3270,7 +3273,6 @@
       <packagereq type="default">kdeplasma-addons</packagereq>
       <packagereq type="default">kdialog</packagereq>
       <packagereq type="default">kdnssd</packagereq>
-      <packagereq type="default">keditbookmarks</packagereq>
       <packagereq type="default">kf5-akonadi-server</packagereq>
       <packagereq type="default">kf5-akonadi-server-mysql</packagereq>
       <packagereq type="default">kf5-baloo-file</packagereq>
@@ -3283,7 +3285,6 @@
       <packagereq type="default">kmag</packagereq>
       <packagereq type="default">kmenuedit</packagereq>
       <packagereq type="default">kmousetool</packagereq>
-      <packagereq type="default">kmouth</packagereq>
       <packagereq type="default">konsole5</packagereq>
       <packagereq type="default">krfb</packagereq>
       <packagereq type="default">kscreen</packagereq>
@@ -3295,7 +3296,6 @@
       <packagereq type="default">kwrite</packagereq>
       <packagereq type="default">libappindicator-gtk3</packagereq>
       <packagereq type="default">NetworkManager-config-connectivity-fedora</packagereq>
-      <packagereq type="default">okular</packagereq>
       <packagereq type="default">PackageKit-command-not-found</packagereq>
       <packagereq type="default">pam-kwallet</packagereq>
       <packagereq type="default">phonon-qt5-backend-gstreamer</packagereq>

From ec10e068a8c7b5176687023176667f52225380a2 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Mar 30 2023 13:36:17 +0000
Subject: [PATCH 8/9] F39: KDE: kde-connect is part of the kde-desktop group


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

---

diff --git a/comps-f39.xml.in b/comps-f39.xml.in
index c409982..692eb34 100644
--- a/comps-f39.xml.in
+++ b/comps-f39.xml.in
@@ -3218,7 +3218,6 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="default">kcalc</packagereq>
-      <packagereq>kde-connect</packagereq>
       <packagereq type="default">keditbookmarks</packagereq>
       <packagereq>kmahjongg</packagereq>
       <packagereq>kmines</packagereq>

From d4e25f6975f44b2af30b04be69d1d0eb94600909 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Mar 30 2023 13:36:17 +0000
Subject: [PATCH 9/9] F39: KDE: Set type="default" for kde-apps group


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

---

diff --git a/comps-f39.xml.in b/comps-f39.xml.in
index 692eb34..2d2b63a 100644
--- a/comps-f39.xml.in
+++ b/comps-f39.xml.in
@@ -3219,14 +3219,14 @@
     <packagelist>
       <packagereq type="default">kcalc</packagereq>
       <packagereq type="default">keditbookmarks</packagereq>
-      <packagereq>kmahjongg</packagereq>
-      <packagereq>kmines</packagereq>
+      <packagereq type="default">kmahjongg</packagereq>
+      <packagereq type="default">kmines</packagereq>
       <packagereq type="default">kmouth</packagereq>
-      <packagereq>konversation</packagereq>
-      <packagereq>kpat</packagereq>
-      <packagereq>krdc</packagereq>
-      <packagereq>krusader</packagereq>
-      <packagereq>ktorrent</packagereq>
+      <packagereq type="default">konversation</packagereq>
+      <packagereq type="default">kpat</packagereq>
+      <packagereq type="default">krdc</packagereq>
+      <packagereq type="default">krusader</packagereq>
+      <packagereq type="default">ktorrent</packagereq>
       <packagereq type="default">okular</packagereq>
     </packagelist>
   </group>