From 411081f5a9b537083f90ee82809f428fef5c698e Mon Sep 17 00:00:00 2001
From: Matthias Saou <matthias@rpmforge.net>
Date: Tue, 22 Aug 2006 14:48:39 +0000
Subject: [PATCH] Fix mail-server group, cosmetic stuff and add oidentd, p7zip
 and ucarp.

---
 comps-fe6.xml.in | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/comps-fe6.xml.in b/comps-fe6.xml.in
index 73aaddeb..f3c5c097 100644
--- a/comps-fe6.xml.in
+++ b/comps-fe6.xml.in
@@ -460,10 +460,11 @@
   <group>
     <id>mail-server</id>
     <_name>Mail Server</_name>
-    <_description>These packages allow you to configure an IMAP or Postfix mail server.</_description>
+    <_description>These packages allow you to configure an IMAP or SMTP mail server.</_description>
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
+      <packagereq type="optional">amavisd-new</packagereq>
       <packagereq type="optional">cyrus-imapd</packagereq>
       <packagereq type="optional">enemies-of-carlotta</packagereq>
       <packagereq type="optional">perl-Cyrus</packagereq>
@@ -562,7 +563,7 @@
         <packagereq type="optional">kid3</packagereq>
         <packagereq type="optional">kover</packagereq>
         <packagereq type="optional">libvisual-plugins</packagereq>
-		<packagereq type="optional">nomadsync</packagereq>
+        <packagereq type="optional">nomadsync</packagereq>
         <packagereq type="optional">soundconverter</packagereq>
         <packagereq type="optional">soundtracker</packagereq>
         <packagereq type="optional">sweep</packagereq>
@@ -629,6 +630,7 @@
         <packagereq type="optional">nagios</packagereq>
         <packagereq type="optional">nfswatch</packagereq>
         <packagereq type="optional">oddjob</packagereq>
+        <packagereq type="optional">p7zip</packagereq>
         <packagereq type="optional">par2cmdline</packagereq>
         <packagereq type="optional">pbzip2</packagereq>
         <packagereq type="optional">puppet</packagereq>
@@ -687,7 +689,7 @@
         <packagereq type="optional">ctrlproxy</packagereq>
         <packagereq type="optional">dnsmasq</packagereq>
         <packagereq type="optional">flumotion</packagereq>
-        <packagereq type="optional">freenx</packagereq>	
+        <packagereq type="optional">freenx</packagereq>
         <packagereq type="optional">icecast</packagereq>
         <packagereq type="optional">ipxripd</packagereq>
         <packagereq type="optional">ircd-hybrid</packagereq>
@@ -695,11 +697,13 @@
         <packagereq type="optional">kannel</packagereq>
         <packagereq type="optional">l2tpd</packagereq>
         <packagereq type="optional">nsd</packagereq>
+        <packagereq type="optional">oidentd</packagereq>
         <packagereq type="optional">openvpn</packagereq>
         <packagereq type="optional">puppet-server</packagereq>
         <packagereq type="optional">rbldnsd</packagereq>
         <packagereq type="optional">sobby</packagereq>
         <packagereq type="optional">torque-server</packagereq>
+        <packagereq type="optional">ucarp</packagereq>
         <packagereq type="optional">ushare</packagereq>
         <packagereq type="optional">vnc-reflector</packagereq>
     </packagelist>
@@ -864,18 +868,6 @@
     </packagelist>
   </group>
 
-  <group>
-    <id>mail-server</id>
-    <_name>Mail Server</_name>
-    <_description>These packages allow you to configure an IMAP or SMTP mail server.</_description>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <packagelist>
-      <packagereq type="optional">amavisd-new</packagereq>
-      <packagereq type="optional">clamav</packagereq>
-    </packagelist>
-  </group>
-
   <group>
     <id>base-x</id>
     <_name>X Window System</_name>