From c0f17e42a9d921ce8702c594e7a747d0d4b23ed3 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Fri, 17 Oct 2014 12:16:10 -0500
Subject: [PATCH] kde-desktop: drop kdepim metapackage, install choice apps
 instead

replace kdepim metapackage with:
akregator, kaddressbook, kmail, knode, kontact, korganizer
---
 comps-f21.xml.in | 7 ++++++-
 comps-f22.xml.in | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/comps-f21.xml.in b/comps-f21.xml.in
index 9745d4c9..3fa932a7 100644
--- a/comps-f21.xml.in
+++ b/comps-f21.xml.in
@@ -3427,6 +3427,7 @@
     <packagelist>
       <packagereq>akonadi</packagereq>
       <packagereq>akonadi-mysql</packagereq>
+      <packagereq>akregator</packagereq>
       <packagereq>apper</packagereq>
       <packagereq>appmenu-qt</packagereq>
       <packagereq>baloo-file</packagereq>
@@ -3437,6 +3438,7 @@
       <packagereq>firewall-config</packagereq>
       <packagereq>gwenview</packagereq>
       <packagereq>initial-setup-gui</packagereq>
+      <packagereq>kaddressbook</packagereq>
       <packagereq>kamera</packagereq>
       <packagereq>kcalc</packagereq>
       <packagereq>kcharselect</packagereq>
@@ -3461,14 +3463,17 @@
       <packagereq>kdegraphics-strigi-analyzer</packagereq>
       <packagereq>kdegraphics-thumbnailers</packagereq>
       <packagereq>kdelibs</packagereq>
-      <packagereq>kdepim</packagereq>
       <packagereq>kdeplasma-addons</packagereq>
       <packagereq>kdnssd</packagereq>
       <packagereq>kget</packagereq>
       <packagereq>kgpg</packagereq>
       <packagereq>kipi-plugins</packagereq>
+      <packagereq>kmail</packagereq>
       <packagereq>kmix</packagereq>
+      <packagereq>knode</packagereq>
       <packagereq>konsole</packagereq>
+      <packagereq>kontact</packagereq>
+      <packagereq>korganizer</packagereq>
       <packagereq>kruler</packagereq>
       <packagereq>kscreen</packagereq>
       <packagereq>ksnapshot</packagereq>
diff --git a/comps-f22.xml.in b/comps-f22.xml.in
index 31be8098..87947e7f 100644
--- a/comps-f22.xml.in
+++ b/comps-f22.xml.in
@@ -3428,6 +3428,7 @@
     <packagelist>
       <packagereq>akonadi</packagereq>
       <packagereq>akonadi-mysql</packagereq>
+      <packagereq>akregator</packagereq>
       <packagereq>apper</packagereq>
       <packagereq>appmenu-qt</packagereq>
       <packagereq>baloo-file</packagereq>
@@ -3438,6 +3439,7 @@
       <packagereq>firewall-config</packagereq>
       <packagereq>gwenview</packagereq>
       <packagereq>initial-setup-gui</packagereq>
+      <packagereq>kaddressbook</packagereq>
       <packagereq>kamera</packagereq>
       <packagereq>kcalc</packagereq>
       <packagereq>kcharselect</packagereq>
@@ -3462,14 +3464,17 @@
       <packagereq>kdegraphics-strigi-analyzer</packagereq>
       <packagereq>kdegraphics-thumbnailers</packagereq>
       <packagereq>kdelibs</packagereq>
-      <packagereq>kdepim</packagereq>
       <packagereq>kdeplasma-addons</packagereq>
       <packagereq>kdnssd</packagereq>
       <packagereq>kget</packagereq>
       <packagereq>kgpg</packagereq>
       <packagereq>kipi-plugins</packagereq>
+      <packagereq>kmail</packagereq>
       <packagereq>kmix</packagereq>
+      <packagereq>knode</packagereq>
       <packagereq>konsole</packagereq>
+      <packagereq>kontact</packagereq>
+      <packagereq>korganizer</packagereq>
       <packagereq>kruler</packagereq>
       <packagereq>kscreen</packagereq>
       <packagereq>ksnapshot</packagereq>