From b39cd4ac4b04ade45a36eaae8f640f2c7148df2d Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Wed, 5 Nov 2014 22:57:44 +0100
Subject: [PATCH] workstation: Update default apps

... as discussed in today's Workstation WG meeting:

 - Add baobab and dnf-plugins-core
 - drop brasero, gnome-dictionary, gnome-logs, gnome-maps,
   gnome-sound-recorder, simple-scan
---
 comps-f21.xml.in | 10 +++-------
 comps-f22.xml.in | 10 +++-------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/comps-f21.xml.in b/comps-f21.xml.in
index d6e66321..0ac7d99e 100644
--- a/comps-f21.xml.in
+++ b/comps-f21.xml.in
@@ -6234,12 +6234,11 @@
       <packagereq>at-spi2-core</packagereq>
       <packagereq>attr</packagereq>
       <packagereq>avahi</packagereq>
+      <packagereq>baobab</packagereq>
       <packagereq>bash-completion</packagereq>
       <packagereq>bc</packagereq>
       <packagereq>bijiben</packagereq>
       <packagereq>bind-utils</packagereq>
-      <packagereq>brasero</packagereq>
-      <packagereq>brasero-nautilus</packagereq>
       <packagereq>bridge-utils</packagereq>
       <packagereq>btrfs-progs</packagereq>
       <packagereq>bzip2</packagereq>
@@ -6259,6 +6258,8 @@
       <packagereq>deltarpm</packagereq>
       <packagereq>desktop-backgrounds-basic</packagereq>
       <packagereq>devassistant</packagereq>
+      <packagereq>dnf</packagereq>
+      <packagereq>dnf-plugins-core</packagereq>
       <packagereq>dos2unix</packagereq>
       <packagereq>dosfstools</packagereq>
       <packagereq>empathy</packagereq>
@@ -6288,14 +6289,11 @@
       <packagereq>gnome-clocks</packagereq>
       <packagereq>gnome-color-manager</packagereq>
       <packagereq>gnome-contacts</packagereq>
-      <packagereq>gnome-dictionary</packagereq>
       <packagereq>gnome-disk-utility</packagereq>
       <packagereq>gnome-documents</packagereq>
       <packagereq>gnome-font-viewer</packagereq>
       <packagereq>gnome-getting-started-docs</packagereq>
       <packagereq>gnome-initial-setup</packagereq>
-      <packagereq>gnome-logs</packagereq>
-      <packagereq>gnome-maps</packagereq>
       <packagereq>gnome-packagekit</packagereq>
       <packagereq>gnome-screenshot</packagereq>
       <packagereq>gnome-session-xsession</packagereq>
@@ -6303,7 +6301,6 @@
       <packagereq>gnome-settings-daemon</packagereq>
       <packagereq>gnome-shell</packagereq>
       <packagereq>gnome-software</packagereq>
-      <packagereq>gnome-sound-recorder</packagereq>
       <packagereq>gnome-system-monitor</packagereq>
       <packagereq>gnome-terminal</packagereq>
       <packagereq>gnome-themes-standard</packagereq>
@@ -6400,7 +6397,6 @@
       <packagereq>setroubleshoot</packagereq>
       <packagereq>setuptool</packagereq>
       <packagereq>shotwell</packagereq>
-      <packagereq>simple-scan</packagereq>
       <packagereq>sos</packagereq>
       <packagereq>sssd</packagereq>
       <packagereq>stunnel</packagereq>
diff --git a/comps-f22.xml.in b/comps-f22.xml.in
index cbe5feaf..2d63f8de 100644
--- a/comps-f22.xml.in
+++ b/comps-f22.xml.in
@@ -6233,12 +6233,11 @@
       <packagereq>at-spi2-core</packagereq>
       <packagereq>attr</packagereq>
       <packagereq>avahi</packagereq>
+      <packagereq>baobab</packagereq>
       <packagereq>bash-completion</packagereq>
       <packagereq>bc</packagereq>
       <packagereq>bijiben</packagereq>
       <packagereq>bind-utils</packagereq>
-      <packagereq>brasero</packagereq>
-      <packagereq>brasero-nautilus</packagereq>
       <packagereq>bridge-utils</packagereq>
       <packagereq>btrfs-progs</packagereq>
       <packagereq>bzip2</packagereq>
@@ -6258,6 +6257,8 @@
       <packagereq>deltarpm</packagereq>
       <packagereq>desktop-backgrounds-basic</packagereq>
       <packagereq>devassistant</packagereq>
+      <packagereq>dnf</packagereq>
+      <packagereq>dnf-plugins-core</packagereq>
       <packagereq>dos2unix</packagereq>
       <packagereq>dosfstools</packagereq>
       <packagereq>empathy</packagereq>
@@ -6287,14 +6288,11 @@
       <packagereq>gnome-clocks</packagereq>
       <packagereq>gnome-color-manager</packagereq>
       <packagereq>gnome-contacts</packagereq>
-      <packagereq>gnome-dictionary</packagereq>
       <packagereq>gnome-disk-utility</packagereq>
       <packagereq>gnome-documents</packagereq>
       <packagereq>gnome-font-viewer</packagereq>
       <packagereq>gnome-getting-started-docs</packagereq>
       <packagereq>gnome-initial-setup</packagereq>
-      <packagereq>gnome-logs</packagereq>
-      <packagereq>gnome-maps</packagereq>
       <packagereq>gnome-packagekit</packagereq>
       <packagereq>gnome-screenshot</packagereq>
       <packagereq>gnome-session-xsession</packagereq>
@@ -6302,7 +6300,6 @@
       <packagereq>gnome-settings-daemon</packagereq>
       <packagereq>gnome-shell</packagereq>
       <packagereq>gnome-software</packagereq>
-      <packagereq>gnome-sound-recorder</packagereq>
       <packagereq>gnome-system-monitor</packagereq>
       <packagereq>gnome-terminal</packagereq>
       <packagereq>gnome-themes-standard</packagereq>
@@ -6398,7 +6395,6 @@
       <packagereq>setroubleshoot</packagereq>
       <packagereq>setuptool</packagereq>
       <packagereq>shotwell</packagereq>
-      <packagereq>simple-scan</packagereq>
       <packagereq>sos</packagereq>
       <packagereq>sssd</packagereq>
       <packagereq>stunnel</packagereq>