From f0c597ad2575b8bfb918240a09719446836353e4 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Thu, 18 Oct 2012 17:09:04 +0900
Subject: [PATCH] mate-desktop: merge f18 changes into f19

---
 comps-f18.xml.in |  2 +-
 comps-f19.xml.in | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index b0d22845..bec70cbb 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -4240,7 +4240,7 @@
     </packagelist>
   </group>
   <group>
-   <id>mate-desktop</id>
+    <id>mate-desktop</id>
     <_name>MATE</_name>
     <_description>MATE Desktop is based on GNOME 2 and provides a powerful graphical user interface for users who seek a simple easy to use traditional desktop interface.</_description>
     <default>false</default>
diff --git a/comps-f19.xml.in b/comps-f19.xml.in
index 982b71c3..160a4979 100644
--- a/comps-f19.xml.in
+++ b/comps-f19.xml.in
@@ -4239,12 +4239,15 @@
     </packagelist>
   </group>
   <group>
-   <id>mate-desktop</id>
+    <id>mate-desktop</id>
     <_name>MATE</_name>
     <_description>MATE Desktop is based on GNOME 2 and provides a powerful graphical user interface for users who seek a simple easy to use traditional desktop interface.</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
+      <packagereq>abrt-desktop</packagereq>
+      <packagereq>setroubleshoot</packagereq>
+      <packagereq>desktop-backgrounds-compat</packagereq>
       <packagereq>mate-corba</packagereq>
       <packagereq>libmatewnck</packagereq>
       <packagereq>mate-conf</packagereq>
@@ -4272,16 +4275,25 @@
       <packagereq>mate-control-center</packagereq>
       <packagereq>mate-panel</packagereq>
       <packagereq>mate-session-manager</packagereq>
+      <packagereq>mate-terminal</packagereq>
+      <packagereq>mate-text-editor</packagereq>
+      <packagereq>mate-themes</packagereq>
+      <packagereq>mate-conf-editor</packagereq>
       <packagereq>firstboot</packagereq>
       <packagereq>network-manager-applet</packagereq>
       <packagereq>nm-connection-editor</packagereq>
       <packagereq>firewall-config</packagereq>
-      <packagereq>fedora-icon-theme</packagereq>
       <packagereq>lightdm-gtk</packagereq>
+      <packagereq>xscreensaver-base</packagereq>
+      <packagereq>yumex</packagereq>
+      <packagereq>ConsoleKit-x11</packagereq>
       <packagereq>NetworkManager-openconnect</packagereq>
       <packagereq>NetworkManager-openvpn</packagereq>
       <packagereq>NetworkManager-pptp</packagereq>
       <packagereq>NetworkManager-vpnc</packagereq>
+      <packagereq>firefox</packagereq>
+      <packagereq>xterm</packagereq>
+      <packagereq>imsettings</packagereq>
      </packagelist>
    </group>
    <group>