update server, merge with normal rpmsrate

3 files changed, 26 insertions, 4 deletions

diff --git a/perl-install/share/compssUsers b/perl-install/share/compssUsers
index 70a711ff1..6737fdf19 100644
--- a/perl-install/share/compssUsers
+++ b/perl-install/share/compssUsers
@@ -30,6 +30,7 @@ Network Computer (client) [icon=terminals] [path=Workstation] [descr=Clients for
 
 Configuration [icon=configuration] [path=Workstation] [descr=Tools to ease the configuration of your computer]
 	CONFIG
+        WEBMIN
 
 Scientific Workstation [icon=sciences] [path=Workstation] [descr=]
 	SCIENCES
diff --git a/perl-install/share/compssUsers.server b/perl-install/share/compssUsers.server
index 49b003ece..3333fd5b5 100644
--- a/perl-install/share/compssUsers.server
+++ b/perl-install/share/compssUsers.server
@@ -8,7 +8,11 @@ Gnome Workstation [icon=gnome] [path=Graphical Environment] [descr=A graphical e
 	GNOME
 	X
 
-Other Graphical Desktops [icon=windowmanager] [path=Graphical Environment] [descr=Icewm, Window Maker]
+Icewm [icon=windowmanager] [path=Graphical Environment] [descr=Icewm]
+	ICEWM
+	X
+
+Other Graphical Desktops [icon=windowmanager] [path=Graphical Environment] [descr=XFce, Window Maker]
 	GRAPHICAL_DESKTOP
 	X
 
diff --git a/perl-install/share/rpmsrate b/perl-install/share/rpmsrate
index cbfc6d1b0..aad854b1f 100644
--- a/perl-install/share/rpmsrate
+++ b/perl-install/share/rpmsrate
@@ -146,8 +146,12 @@ NETWORKING_FILE_TRANSFER
 
 NETWORKING_FILE_TRANSFER_SERVER
   4 proftpd
+  4 WIZARDS wizards_lib-ftp
   2 wu-ftpd anonftp
 
+NETWORKING_LDAP_SERVER
+  4 openldap directory_administrator
+
 NETWORKING_INSTANT_MESSAGING
   4 licq
   3 everybuddy licq-autoreply licq-console licq-forwarder licq-rms licq-update-hosts
@@ -163,10 +167,14 @@ NETWORKING_IRC
   1 eggdrop
 
 NETWORKING_FIREWALLING_SERVER
-  5 iproute2 routed iptables ipchains
+  5 iproute2 routed iptables ipchains 
+  5 WIZARDS wizards_lib-firewall
   3 prelude
   1 portsentry 
 
+NETWORKING_GROUPWARE_SERVER
+  4 phpgroupware
+
 NETWORKING_MAIL
   5 mailx metamail
   4 faces mozilla-mail evolution
@@ -176,6 +184,7 @@ NETWORKING_MAIL
   1 exmh mutt fetchmail-daemon fetchmailconf pine
 NETWORKING_MAIL_SERVER
   5 postfix 
+  5 WIZARDS wizards_lib-postfix
   4 sympa 
 
 NETWORKING_NEWS
@@ -183,7 +192,8 @@ NETWORKING_NEWS
   2 slrn tin trn 
   1 slrn-pull xrn
 NETWORKING_NEWS_SERVER
-  4 inn
+  4 inn 
+  4 WIZARDS wizards_lib-news
   3 inews 
 
 NETWORKING_OTHER
@@ -191,6 +201,7 @@ NETWORKING_OTHER
     htdig macutils queso
 NETWORKING_OTHER_SERVER
   3 dhcp gated timed xntp3 
+  3 WIZARDS wizards_lib-dhcp wizards_lib-time 
 
   3 intimed mcserv nscd imap pidentd
     rdate bootparamd 
@@ -221,6 +232,7 @@ NETWORKING_DNS
   4 bind-utils 
 NETWORKING_DNS_SERVER
   5 bind 
+  5 WIZARDS wizards_lib-dns
   4 caching-nameserver
   1 nslint
 
@@ -231,6 +243,7 @@ NETWORKING_FILE
   1 am-utils autofs
 NETWORKING_FILE_SERVER 
   5 nfs-utils
+  4 WIZARDS wizards_lib-samba
   4 samba
   3 BOOKS samba-doc 
   2 arkeia-server-shareware samba-winbind
@@ -247,6 +260,7 @@ NETWORKING_WWW
 NETWORKING_WWW_SERVER
   5 apache apache-mod_perl mod_ssl
   4 apache-suexec 
+  4 WIZARDS wizards_lib-web
   4 BOOKS apache-manual
   3 php-dba_gdbm_db2 php-gd php-imap php-ldap php-manual php-mysql php-oracle
     php-pgsql php-readline php mod_php mod_ssl-sxnet auth_ldap HTML-Embperl PHP-nuke
@@ -432,10 +446,13 @@ FILE_TOOLS
   2 git gentoo sfm xwc FileRunner
   1 xdelta
 
+WEBMIN
+  5 webmin
+
 CONFIG
   4 userdrake linuxconf linuxconf-lang-fr linuxconf-lang-de
   4 GNOME gnome-linuxconf
-  3 webmin Bastille-Curses-module
+  3 Bastille-Curses-module
   3 ipvsadm quota usernet
   2 gfcc control-panel adjtimex isicom xinput timeconfig Bastille-Tk-module 
     samba-swat