adjust configuration of classical server cluster, and remove annoying

entries

2 files changed, 24 insertions, 33 deletions

diff --git a/perl-install/share/compssUsers b/perl-install/share/compssUsers
index 8d9e050af..8d23b33ac 100644
--- a/perl-install/share/compssUsers
+++ b/perl-install/share/compssUsers
@@ -74,18 +74,7 @@ Classical Cluster Server  [icon=hardware] [path=Server] [descr=Install a new lig
 	X
 	TERMINALS
 	NETWORKING_WWW
-
-AutoInstall Server [icon=hardware] [path=Server] [descr=Autoinstallation Server For Cluster Nodes (pxe, dhcp, tftp...)] 
-        NETWORKING_AUTOINSTALL_SERVER
-        NETWORKING_FILE_TRANSFER_SERVER
-        NETWORKING_DNS_SERVER
-
-DNS/NIS [icon=hardware] [path=Server] [descr=Domain Name and Network Information Server] 
-	NIS_SERVER
-	NETWORKING_DNS_SERVER
-
-Basic System Configuration Tools [icon=configuration] [path=Server] [descr=Tools to ease the configuration of your computer]
-        CLUSTER_ADMINISTRATION
+	CLUSTER_ADMINISTRATION
 
 Other Tools [icon=terminals] [path=Server] [descr=Editors, shells, file tools, terminals]
         EDITORS
diff --git a/perl-install/share/rpmsrate b/perl-install/share/rpmsrate
index a916e8047..140ff5552 100644
--- a/perl-install/share/rpmsrate
+++ b/perl-install/share/rpmsrate
@@ -23,7 +23,7 @@ EDITORS
    5 vim-enhanced
    5 nedit
    4 emacs-X11
-      
+
 TEXT_TOOLS
   5 groff patch 
 
@@ -37,11 +37,13 @@ SCIENCES_VIRTUALITY
    5 netjuggler
 
 SCHEDULER
-   5 OpenPBS-client OpenPBS-xpbs
+   5 pbs-5.3.3 pbs-cmds pbs-mon 
+   1 OpenPBS-client OpenPBS-xpbs
 SCHEDULER_SERVER
-   5 OpenPBS
-   5 OpenPBS-xpbs
-   5 maui
+   5 pbs-5.3.3
+   1 OpenPBS
+   1 OpenPBS-xpbs
+   1 maui
 
 CLUSTER_INTERCONNECT
    5 mpich lam-runtime
@@ -55,14 +57,14 @@ CLUSTER_DEVELOPMENT
    5 libauthd0-devel libe-devel libgexec0-devel libpcp0-devel libOpenPBS2-devel libganglia-monitor1-devel
    5 liblapack3-devel libmpich1-devel libscalapack0-devel libpetsc2-devel
    3 libpvm-devel pmake libpmake0-devel
-   2 lam-devel liblam0-devel libxmpi0-devel
+   2 liblam6-devel lam-devel liblam0-devel libxmpi0-devel
 CLUSTER_ADMINISTRATION
    5 clusterit
 SETUP_CLIENT
    5 clusterscripts-client ntp
 SETUP_SERVER
-   5 clusterscripts-server ntp
-   
+   5 clusterscripts-server ntp urpmi-parallel-ka-run
+
 CLUSTER_FILESYSTEM
    1 clusternfs
 
@@ -78,7 +80,7 @@ NETWORKING_FILE_TRANSFER_SERVER
 
 NETWORKING_DUPLICATION_SERVER
   5 ka-deploy-source-node
-  
+
 NETWORKING_AUTOINSTALL_SERVER
   5 dhcp-server pxe ka-deploy-server-host 
   2 pxe-bootstraps
@@ -113,7 +115,7 @@ NETWORKING_WWW_SERVER
    5 apache apache-mod_perl
    5 apache-suexec
    5 php-xml php mod_php mod_perl_common
-   
+
 NETWORKING_OTHER_TOOLS
   3 tcpdump traceroute
 
@@ -134,13 +136,13 @@ DEVELOPMENT
 
   5 libtool binutils ltrace gdb gcc
 
-  4 gcc-c++ libstdc++-devel
+  4 gcc-c++ libstdc++5-devel libstdc++-devel
 
   3 bison flex
   2 byacc
 
   2 pvm-examples
-  
+
   1 gcc-java
 
   5 cvs
@@ -157,18 +159,18 @@ DEVELOPMENT
   3 kernel-source
 
   2 gcc-g77 nasm dev86 
-  
+
   4 gettext-devel
 
   2 mawk
-  
+
   4 j2sdk
 
   DEVELOPMENT_OTHER
     2 ImageMagick-devel Mesa-common-devel Xaw3d-devel detect-devel
-      gd-devel p2c-devel gmp-devel guile-devel libgr-devel libjpeg-devel libpng-devel
-      libtermcap-devel libtiff-devel libungif-devel libxml-devel libxml2-devel
-      linuxconf-devel slang-devel sox-devel zlib-devel dev86-devel
+      libgd1-devel gd-devel p2c-devel gmp-devel guile-devel libgr-devel libjpeg-devel libpng3-devel libpng-devel
+      libtermcap-devel libtiff-devel libungif4-devel libungif-devel libxml-devel libxml2-devel
+      linuxconf-devel slang-devel sox-devel zlib1-devel zlib-devel dev86-devel
       gdk-pixbuf-devel gimp-devel gpm-devel kudzu-devel libghttp-devel libgtop-devel
       libmikmod-devel librep-devel libunicode-devel popt-devel pwdb-devel t1lib-devel
       ucd-snmp-devel mpeg_lib-devel WindowMaker-devel aalib-devel adns-devel
@@ -224,9 +226,9 @@ SYSTEM
   5 at gnupg MAKEDEV eject ldetect devfsd
     locales iputils urpmi perl cpio msec tmpwatch
 
-  5 HIGH_SECURITY libsafe kernel-secure-2.4.19.16mdk kernel-secure
-  5 BIGMEM kernel-enterprise-2.4.19.16mdk kernel-enterprise
-  5 SMP kernel-smp-2.4.19.16mdk kernel-smp
+  5 HIGH_SECURITY libsafe kernel-secure-2.4.19.16mdk kernel-secure-2.4.19.32mdk kernel-secure
+  5 BIGMEM kernel-enterprise-2.4.19.16mdk kernel-enterprise-2.4.19.32mdk kernel-enterprise
+  5 SMP kernel-smp-2.4.19.16mdk kernel-smp-2.4.19.32mdk kernel-smp
   5 PCMCIA pcmcia-cs
   5 USB hotplug
 
@@ -251,7 +253,7 @@ SYSTEM
 
 INSTALL
   NOCOPY
-    5 kernel-2.4.19.16mdk kernel kernel-smp-2.4.19.16mdk kernel-smp kernel-enterprise-2.4.19.16mdk kernel-enterprise
+    5 kernel-2.4.19.16mdk kernel-2.4.19.32mdk kernel kernel-smp-2.4.19.16mdk kernel-smp-2.4.19.32mdk kernel-smp kernel-enterprise-2.4.19.16mdk kernel-enterprise-2.4.19.32mdk kernel-enterprise
       raidtools lvm reiserfsprogs jfsprogs xfsprogs 
     4 XFree86 XFree86-xfs