2 files changed, 29 insertions, 20 deletions
diff --git a/perl-install/share/rpmsrate.corpo-desktop b/perl-install/share/rpmsrate.corpo-desktop
index cb878aa41..10013d9b7 100644
--- a/perl-install/share/rpmsrate.corpo-desktop
+++ b/perl-install/share/rpmsrate.corpo-desktop
@@ -17,7 +17,7 @@ GNOME
   2 bug-buddy
 
 KDE
-  5 kdebase-progs kdebase-nsplugins mdkkdm galaxy-kde galaxy-kde-kwin mandrakegalaxy krozat kdeartwork-kde-classic kdeartwork
+  5 kdebase-progs kdebase-nsplugins mdkkdm mandrakelinux-kdm-logo galaxy-kde galaxy-kde-kwin mandrakegalaxy krozat kdeartwork-kde-classic kdeartwork
   5 kde-i18n-af kde-i18n-ar
   5 kdebase-servicemenu zip
   5 kdeutils kdeutils-kcharselect
@@ -50,6 +50,7 @@ OFFICE
   5 KDE kdenetwork-kdict
   5 KDE kdepim-karm
   4 acroread acroread-nppdf
+  4 perl-libxml-enno crossover-standard-mdkdemo
   3 gnumeric
   3 gaddr xpdf
   3 wv ical
@@ -244,7 +245,7 @@ NETWORKING_MAIL_SERVER
   3 imap
 
 NETWORKING_NEWS
-  5 KDE kdenetwork-knode
+  5 KDE kdepim-knode
   5 GNOME pan
   2 slrn
   1 slrn-pull
@@ -275,14 +276,14 @@ NIS_SERVER
 
 NETWORKING_REMOTE_ACCESS
   5 openssh-clients telnet-client-krb5
-  4 traceroute rfbdrake
+  4 traceroute rfbdrake nxclient ICAClient
   3 KDE kdeutils-kdessh lisa
   3 tightvnc
   2 rsh
 
 NETWORKING_REMOTE_ACCESS_SERVER
   5 openssh-server
-  4 rfbdrake
+  4 rfbdrake nxserver
   2 tightvnc-server
   1 telnet-server-krb5 rsh-server
   3 BOOKS tight-vnc-doc
@@ -316,7 +317,7 @@ NETWORKING_WWW
   5 KDE quanta
   5 GNOME screem
   5 GNOME epiphany
-  4 FlashPlayer crossover-plugin-demo j2re
+  4 FlashPlayer j2re
   4 wget
   4 lynx
   3 KDE kdeaddons
@@ -607,6 +608,8 @@ SYSTEM
 
   5 lshw OpenIPMI dmidecode
 
+  5 castella-pkcs11 castella-tokenadmin castella-dialogs-gtk castella-daemon castella-dialogs-gtk castella-pam castella-pkcs11-client pcsc-lite
+
   5 HIGH_SECURITY libsafe kernel-secure lads
   5 BIGMEM kernel-i686-up-4GB
   5 SMP kernel-smp
@@ -620,12 +623,8 @@ SYSTEM
      HIGH_SECURITY NVIDIA_nforce-secure
      BIGMEM NVIDIA_nforce-enterprise
 
-  5 HW"iKey 3000 Token" rnboifd
-  5 HW"OmniKey Cardman"
-     cm2020
-     SMP cm2020-smp
-     HIGH_SECURITY cm2020-secure
-     BIGMEM cm2020-enterprise
+  5 DRIVER"smartcard:rnboifd" rnboifd
+  5 DRIVER"smartcard:cmok_ccid" cmok_ccid
 
   5 KDE kdeutils-kfloppy
   5 KDE kdeutils-kdepasswd
@@ -640,7 +639,13 @@ SYSTEM
       SMP kernel-smp-2.4
       BIGMEM kernel-enterprise-2.4
 
-  5 HW"Intel Corp.|PRO/Wireless LAN" ndiswrapper
+  5 DRIVER"ipw2100" ipw2100-firmware ipw2100-kernel
+  5 DRIVER"ipw2200" ipw2200-firmware ipw2200-kernel
+  5 DRIVER"ath_pci" madwifi-kernel
+  5 DRIVER"slamr|slusb|snd-atiixp-modem|snd-intel8x0m|snd-via82xx-modem" slmodem
+  5 DRIVER"slamr|slusb" slmodem-kernel
+
+  5 atmel-firmware prism54-firmware
 
   4 ftp-client-krb5 hexedit strace sudo grub procmail hdparm coreutils-doc
   4 PCMCIA netprofile
@@ -690,6 +695,7 @@ INSTALL
     ibod isdn4net isdn-light isdn4k-utils kernel-2.4
     eagle-usb
     speedtouch speedtouch_mgmt
+    dkms-minimal
 
   5 cups cups-drivers hpoj libhpojip 
   4 XFree86-SVGA XFree86-server XFree86-Mach64 XFree86-FBDev
diff --git a/perl-install/share/rpmsrate.corpo-server b/perl-install/share/rpmsrate.corpo-server
index 8e66040f2..5adeb976d 100644
--- a/perl-install/share/rpmsrate.corpo-server
+++ b/perl-install/share/rpmsrate.corpo-server
@@ -2,7 +2,7 @@ LSB
   5 lsb
 
 GRAPHICAL_DESKTOP
-  4 icewm
+  4 icewm qiv
   3 WindowMaker
   3 Epplets blackbox enlightenment ethemes icepref xfce
   2 wmnet
@@ -241,8 +241,9 @@ NETWORKING_MAIL
 
 NETWORKING_MAIL_SERVER
   5 postfix 
-  4 mailman
-  3 imap
+  4 mailman amavisd-new spamassassin clamd imap
+  4 quota
+  4 squirrelmail
 
 NETWORKING_NEWS
   5 KDE kdenetwork-knode
@@ -276,14 +277,14 @@ NIS_SERVER
 
 NETWORKING_REMOTE_ACCESS
   5 openssh-clients telnet-client-krb5
-  4 traceroute rfbdrake
+  4 traceroute rfbdrake nxclient ICAClient
   3 KDE kdeutils-kdessh lisa
   3 tightvnc
   2 rsh
 
 NETWORKING_REMOTE_ACCESS_SERVER
-  5 openssh-server
-  4 rfbdrake
+  5 openssh-server openssh-clients
+  4 rfbdrake nxserver
   2 tightvnc-server
   1 telnet-server-krb5 rsh-server
   3 BOOKS tight-vnc-doc
@@ -307,6 +308,7 @@ NETWORKING_FILE
 NETWORKING_FILE_SERVER 
   5 nfs-utils
   4 samba-server
+  4 quota
   3 BOOKS samba-doc
   3 KDE kdenetwork-krfb
   2 arkeia-server samba-winbind
@@ -547,7 +549,7 @@ WIZARDS
   5 drakwizard
 
 CONFIG
-  3 ipvsadm quota nut
+  3 ipvsadm nut
   2 gfcc adjtimex xinput timeconfig samba-swat
   1 ipxutils
 
@@ -676,7 +678,7 @@ INSTALL
   NOCOPY
     5 kernel kernel-smp kernel-i686-up-4GB
       raidtools lvm2 reiserfsprogs jfsprogs xfsprogs 
-      alsa-utils
+      alsa-utils mdadm
     4 XFree86 brltty
 
   5 pptp-adsl dhcpcd dhcpxd dhcp-client rp-pppoe pump
@@ -691,6 +693,7 @@ INSTALL
     ibod isdn4net isdn-light isdn4k-utils kernel-2.4
     eagle-usb
     speedtouch speedtouch_mgmt
+    dkms-minimal
 
   5 cups cups-drivers hpoj libhpojip 
   4 XFree86-SVGA XFree86-server XFree86-Mach64 XFree86-FBDev