From 9a584d6662f859c45a5417a1be71bdd27831e009 Mon Sep 17 00:00:00 2001
From: Dan Mashal <dan.mashal@fedoraproject.org>
Date: Thu, 16 May 2013 00:35:50 -0400
Subject: [PATCH] Switch mate-desktop to claws-mail instead of evolution and
 remove the optional tags

---
 comps-f19.xml.in | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/comps-f19.xml.in b/comps-f19.xml.in
index 23a0f994..9a833c66 100644
--- a/comps-f19.xml.in
+++ b/comps-f19.xml.in
@@ -4172,7 +4172,7 @@
       <packagereq>libmatewnck</packagereq>
       <packagereq>mate-applets</packagereq>
       <packagereq>mate-backgrounds</packagereq>
-      <packagereq type="optional">mate-bluetooth</packagereq>
+      <packagereq>mate-bluetooth</packagereq>
       <packagereq>mate-calc</packagereq>
       <packagereq>mate-control-center</packagereq>
       <packagereq>mate-desktop</packagereq>
@@ -4187,7 +4187,7 @@
       <packagereq>mate-keyring</packagereq>
       <packagereq>mate-keyring-pam</packagereq>
       <packagereq>mate-media</packagereq>
-      <packagereq type="optional">mate-menu-editor</packagereq>
+      <packagereq>mate-menu-editor</packagereq>
       <packagereq>mate-menus</packagereq>
       <packagereq>mate-notification-daemon</packagereq>
       <packagereq>mate-panel</packagereq>
@@ -4197,11 +4197,11 @@
       <packagereq>mate-session-manager</packagereq>
       <packagereq>mate-settings-daemon</packagereq>
       <packagereq>mate-system-log</packagereq>
-      <packagereq type="optional">mate-system-monitor</packagereq>
+      <packagereq>mate-system-monitor</packagereq>
       <packagereq>mate-terminal</packagereq>
       <packagereq>mate-text-editor</packagereq>
       <packagereq>mate-themes</packagereq>
-      <packagereq type="optional">mate-utils</packagereq>
+      <packagereq>mate-utils</packagereq>
       <packagereq>mate-window-manager</packagereq>
       <packagereq>NetworkManager</packagereq>
       <packagereq>network-manager-applet</packagereq>
@@ -4210,11 +4210,11 @@
       <packagereq>NetworkManager-openvpn</packagereq>
       <packagereq>NetworkManager-pptp</packagereq>
       <packagereq>NetworkManager-vpnc</packagereq>
-      <packagereq type="optional">brasero</packagereq>
+      <packagereq>brasero</packagereq>
       <packagereq>dconf</packagereq>
-      <packagereq type="optional">dconf-editor</packagereq>
-      <packagereq type="optional">desktop-backgrounds-basic</packagereq>
-      <packagereq type="optional">fedora-icon-theme</packagereq>
+      <packagereq>dconf-editor</packagereq>
+      <packagereq>desktop-backgrounds-basic</packagereq>
+      <packagereq>fedora-icon-theme</packagereq>
       <packagereq>firefox</packagereq>
       <packagereq>firewall-config</packagereq>
       <packagereq>geany</packagereq>
@@ -4225,13 +4225,13 @@
       <packagereq>gvfs-mtp</packagereq>
       <packagereq>gtk2-engines</packagereq>
       <packagereq>hexchat</packagereq>
-      <packagereq>imsettings</packagereq>
+      <packagereq>imsettings-mate</packagereq>
       <packagereq>pavucontrol</packagereq>
       <packagereq>pidgin</packagereq>
-      <packagereq type="optional">simple-scan</packagereq>
-      <packagereq>evolution</packagereq>
-      <packagereq type="optional">tigervnc</packagereq>
-      <packagereq type="optional">transmission-gtk</packagereq>
+      <packagereq>simple-scan</packagereq>
+      <packagereq>claws-mail</packagereq>
+      <packagereq>tigervnc</packagereq>
+      <packagereq>transmission-gtk</packagereq>
       <packagereq>vim-enhanced</packagereq>
       <packagereq>yelp</packagereq>
       <packagereq>yumex</packagereq>