2 files changed, 51 insertions, 44 deletions

diff --git a/perl-install/share/compssUsers.desktop b/perl-install/share/compssUsers.desktop
index 2118da052..c3db2a286 100644
--- a/perl-install/share/compssUsers.desktop
+++ b/perl-install/share/compssUsers.desktop
@@ -4,6 +4,8 @@
 KDE Workstation [icon=kde] [path=Workstation] [selected=desktop] [descr=The K Desktop Environment, the basic graphical environment with a collection of accompanying tools]
 	KDE
 	X
+	TERMINALS
+	NETWORKING_OTHER
 
 Office Workstation [icon=office] [path=Workstation] [selected=desktop] [descr=Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, gnumeric), pdf viewers, etc]
 	OFFICE
diff --git a/perl-install/share/rpmsrate b/perl-install/share/rpmsrate
index 9b1d2c0e8..d08de838a 100644
--- a/perl-install/share/rpmsrate
+++ b/perl-install/share/rpmsrate
@@ -34,7 +34,7 @@ TV
 OFFICE
   5 OpenOffice.org
   5 OpenOffice.org-help-cs OpenOffice.org-help-de OpenOffice.org-help-en OpenOffice.org-help-es OpenOffice.org-help-fi OpenOffice.org-help-fr OpenOffice.org-help-it OpenOffice.org-help-ja OpenOffice.org-help-ko OpenOffice.org-help-ru OpenOffice.org-help-sv OpenOffice.org-help-zh_CN OpenOffice.org-help-zh_TW
-  5 OpenOffice.org-l10n-ar OpenOffice.org-l10n-ca OpenOffice.org-l10n-cs OpenOffice.org-l10n-da OpenOffice.org-l10n-de OpenOffice.org-l10n-el OpenOffice.org-l10n-en OpenOffice.org-l10n-es OpenOffice.org-l10n-fi OpenOffice.org-l10n-fr OpenOffice.org-l10n-it OpenOffice.org-l10n-ja OpenOffice.org-l10n-ko OpenOffice.org-l10n-nl OpenOffice.org-l10n-pl OpenOffice.org-l10n-pt OpenOffice.org-l10n-ru OpenOffice.org-l10n-sk OpenOffice.org-l10n-sv OpenOffice.org-l10n-tr OpenOffice.org-l10n-zh_CN OpenOffice.org-l10n-zh_TW
+  5 OpenOffice.org-l10n-ar OpenOffice.org-l10n-ca OpenOffice.org-l10n-cs OpenOffice.org-l10n-da OpenOffice.org-l10n-de OpenOffice.org-l10n-el OpenOffice.org-l10n-en OpenOffice.org-l10n-es OpenOffice.org-l10n-fi OpenOffice.org-l10n-fr OpenOffice.org-l10n-it OpenOffice.org-l10n-ja OpenOffice.org-l10n-ko OpenOffice.org-l10n-nl OpenOffice.org-l10n-pl OpenOffice.org-l10n-pt OpenOffice.org-l10n-pt_BR OpenOffice.org-l10n-ru OpenOffice.org-l10n-sk OpenOffice.org-l10n-sv OpenOffice.org-l10n-tr OpenOffice.org-l10n-zh_CN OpenOffice.org-l10n-zh_TW
   5 dia
   5 gnucash gnucash-hbci gnucash-ofx
   5 mrproject
@@ -47,19 +47,18 @@ OFFICE
     5 kdepim-korganizer
     5 kdepim-kaddressbook
     5 kdepim-knotes
-    5 kdebase-kdeprinterfax
     5 kdegraphics-kghostview
-    3 koffice koffice-i18n-bg koffice-i18n-cs koffice-i18n-da koffice-i18n-de koffice-i18n-en_GB koffice-i18n-eo koffice-i18n-es koffice-i18n-et koffice-i18n-fr koffice-i18n-hu koffice-i18n-it koffice-i18n-ja koffice-i18n-mt koffice-i18n-nb koffice-i18n-nl koffice-i18n-nn koffice-i18n-pl koffice-i18n-pt koffice-i18n-pt_BR koffice-i18n-ru koffice-i18n-sk koffice-i18n-sl koffice-i18n-sv koffice-i18n-tr koffice-i18n-uk koffice-i18n-zh_CN koffice-i18n-zh_TW
+    3 koffice koffice-i18n-az koffice-i18n-bg koffice-i18n-cs koffice-i18n-da koffice-i18n-de koffice-i18n-en_GB koffice-i18n-eo koffice-i18n-es koffice-i18n-et koffice-i18n-fr koffice-i18n-hu koffice-i18n-it koffice-i18n-ja koffice-i18n-lt koffice-i18n-mt koffice-i18n-nb koffice-i18n-nl koffice-i18n-nn koffice-i18n-pl koffice-i18n-pt koffice-i18n-pt_BR koffice-i18n-ro koffice-i18n-ru koffice-i18n-sk koffice-i18n-sl koffice-i18n-sv koffice-i18n-ta koffice-i18n-tr koffice-i18n-uk koffice-i18n-zh_CN koffice-i18n-zh_TW
   GNOME
     4 gnome-pim
     3 gnome-pilot-conduits Guppi
     2 ggv 
 
 SPELLCHECK
-  5 aspell-br aspell-ca aspell-cs aspell-cy aspell-da aspell-de aspell-el aspell-en aspell-eo aspell-es aspell-fo aspell-fr aspell-ga aspell-hr aspell aspell-it aspell-nl aspell-no aspell-pl aspell-pt aspell-ro aspell-ru aspell-sk aspell-sv aspell-uk
+  5 aspell-br aspell-ca aspell-cs aspell-cy aspell-da aspell-de aspell-el aspell-en aspell-eo aspell-es aspell-fo aspell-fr aspell-ga aspell-hr aspell-hu aspell-it aspell-nl aspell-no aspell-pl aspell-pt aspell-ro aspell-ru aspell-sk aspell-sv aspell-uk aspell
   5 ispell-af ispell-en ispell-fi ispell-gd ispell-gv ispell-id ispell-sl
-  5 myspell-bg_BG myspell-ca_ES myspell-cs_CZ myspell-da_DK myspell-de_CH myspell-de_DE myspell-el_GR myspell-en_CA myspell-en_GB myspell-en_US myspell-es_ES myspell-fr_FR myspell-ga_IE myspell-gl_ES myspell-hr_HR myspell-hu_HU myspell-it_IT myspell-nb_NO myspell-nl_NL myspell-nn_NO myspell-pl_PL myspell-pt_BR myspell-pt_PT myspell-ru_RU myspell-sk_SK myspell-sl_SI myspell-sv_SE myspell-uk_UA
-  5 myspell-hyph-cs myspell-hyph-da myspell-hyph-de myspell-hyph-en myspell-hyph-es myspell-hyph-fr myspell-hyph-it myspell-hyph-nl myspell-hyph-ru myspell-hyph-sk myspell-hyph-sl myspell-hyph-uk
+  5 myspell-bg_BG myspell-ca_ES myspell-cs_CZ myspell-da_DK myspell-de_AT myspell-de_CH myspell-de_DE myspell-el_GR myspell-en_AU myspell-en_CA myspell-en_GB myspell-en_US myspell-es_ES myspell-es_MX myspell-fo_FO myspell-fr_BE myspell-fr_FR myspell-ga_IE myspell-gl_ES myspell-hr_HR myspell-hu_HU myspell-it_IT myspell-lt_LT myspell-nb_NO myspell-nl_NL myspell-nn_NO myspell-pl_PL myspell-pt_BR myspell-pt_PT myspell-ru_RU myspell-sk_SK myspell-sl_SI myspell-sv_SE myspell-uk_UA
+  5 myspell-hyph-cs myspell-hyph-da myspell-hyph-de myspell-hyph-en myspell-hyph-es myspell-hyph-fr myspell-hyph-hu myspell-hyph-it myspell-hyph-nl myspell-hyph-ru myspell-hyph-sk myspell-hyph-sl myspell-hyph-sv myspell-hyph-uk
 
 SOUND
   5 KDE kdemultimedia-kmix
@@ -71,7 +70,8 @@ AUDIO
   5 KDE kdemultimedia-kscd
   5 totem
   5 KDE kdemultimedia-kaudiocreator
-  4 GNOME gnome-audio gnome-media
+  5 gnome-media
+  4 GNOME gnome-audio
   3 grip xmms xmms-skins
   3 3D xmms-mesa
   3 cdp cdparanoia cdrecord-cdda2wav space_sounds timidity-instruments xmms-esd
@@ -139,7 +139,8 @@ TERMINALS
   5 !KDE !GNOME xterm
   5 KDE kdebase-konsole
   5 GNOME gnome-terminal
-  4 screen kon2 bash-completion
+  4 screen kon2
+  3 bash-completion
   3 Eterm vlock
   3 aterm x3270
 
@@ -151,7 +152,7 @@ NETWORKING_CHAT
 NETWORKING_CHAT_SERVER
   4 jabber 
   3 talk-server
-    
+
 NETWORKING_FILE_TRANSFER
   5 KDE kbear
   5 GNOME gftp
@@ -159,7 +160,7 @@ NETWORKING_FILE_TRANSFER
   4 rdist
   3 fmirror ncftp tftp
   2 uucp
-  
+
 NETWORKING_FILE_TRANSFER_SERVER
   4 proftpd bwbserver_linux
   2 wu-ftpd anonftp
@@ -217,6 +218,7 @@ NETWORKING_NEWS_SERVER
   3 inews 
 
 NETWORKING_OTHER
+  5 KDE kdenetwork-kppp
   2 finger ucd-snmp-utils htdig macutils
 
 NETWORKING_OTHER_SERVER
@@ -371,7 +373,7 @@ DEVELOPMENT
   2 gperf indent
   1 glibc-profile xxgdb
 
-  4 gcc-c++ libstdc++-devel
+  4 gcc-c++ libstdc++5-devel libstdc++-devel
   2 libsigc++-examples
 
   4 bison flex
@@ -388,7 +390,7 @@ DEVELOPMENT
   3 swig
 
   4 python tkinter
-  3 python-devel python-imaging pygtk-glarea pygtk pygtk-libglade rpm-python
+  3 libpython2.3-devel python-devel python-imaging pygtk-glarea pygtk pygtk-libglade rpm-python
 
   4 perl perl-Term-Readline-Gnu perl-libwww-perl perl-devel
   3 perl-DBI perl-IO-stringy perl-PDL perl-Parse-RecDescent 
@@ -406,45 +408,45 @@ DEVELOPMENT
   2 gprolog ocaml umb-scheme mawk guile clispp2c 
     hugs98 mercury swi-prolog ruby 
 
-  4 gettext-devel ncurses-devel
+  4 gettext-devel libncurses5-devel ncurses-devel
 
   BOOKS
     2 pam-doc python-docs slang-doc kernel-doc nasm-doc qt2-doc ruby-doc lkmpg
 
   KDE
     4 kdevelop
-    4 libkdebase-devel libkdebase-kate-devel libkdebase-nsplugins-devel libkdecore-devel 
-      libkdeedu-devel libkdegames-devel libkdegraphics-common-devel
+    4 libkdebase4-devel libkdebase-devel libkdebase-kate-devel libkdebase-nsplugins-devel libkdecore4-devel libkdecore-devel 
+      libkdeedu1-devel libkdeedu-devel libkdegames1-devel libkdegames-devel libkdegraphics-common-devel
       libkdegraphics-kooka-devel libkdemultimedia-common-devel libkdenetwork-common-devel
-      libkdepim-common-devel libkdepim-devel libkdesdk-devel libkdetoys-devel
-      libkdeutils-common-devel libkdeutils-devel libkdeutils-ksim-devel
-      libkdevelop-devel
+      libkdepim-common-devel libkdepim2-devel libkdepim-devel libkdesdk1-devel libkdesdk-devel libkdetoys1-devel libkdetoys-devel
+      libkdeutils-common-devel libkdeutils1-devel libkdeutils-devel libkdeutils-ksim-devel
+      libkdevelop2-devel libkdevelop-devel
 
-    1 kdesupport-devel kdeaddutils-devel koffice-devel
+    1 kdesupport-devel kdeaddutils-devel libkoffice2-devel koffice-devel
 
   GNOME
     4 perl-GTK-Glade perl-GTK-Gnome 
     3 glade pygnome libgnomeui2_0-devel gnome-guile-devel
       gob 
     2 pygnome-capplet pygnome-libglade
-      gnomemm-devel gnome-pilot-devel glademm 
-    1 gnucash-devel
+      libgnomemm-1.2_9-devel gnomemm-devel libgnome-pilot2-devel gnome-pilot-devel glademm 
+    1 libgnucash0-devel gnucash-devel
 
   DEVELOPMENT_OTHER
-    2 libMagick-devel libMesaGLU1-devel Xaw3d-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
-      slang-devel sox-devel zlib-devel libxfree86-devel dev86-devel
-      gdk-pixbuf-devel gimp-devel gpm-devel libghttp-devel libgtop-devel
-      libmikmod-devel librep-devel libunicode-devel popt-devel pwdb-devel t1lib-devel
-      libsnmp-devel mpeg_lib-devel WindowMaker-devel libaa-devel adns-devel
-      libalsa-devel audiofile-devel cups-devel e2fsprogs-devel
-      g-wrap-devel gkrellm-devel libPropList-devel licq-devel openldap-devel
-      parted-devel pciutils-devel pilot-link-devel svgalib-devel
-      recode-devel aspell-devel cracklib-devel faces-devel fnlib-devel
-      freetype-devel gtk+mdk-devel gtkglarea-devel libxfree86-static-devel imap-devel
-      php-devel pth-devel sane-devel swig-devel xdelta-devel isapnptools-devel
-      pango-devel readline-devel
+    2 libMagick5.5.7-devel libMagick-devel libMesaGLU1-devel libXaw3d7-devel Xaw3d-devel
+      libgd2-devel gd-devel p2c-devel libgmp3-devel gmp-devel libguile12-devel guile-devel libgr-devel libjpeg62-devel libjpeg-devel libpng3-devel libpng-devel
+      libtermcap2-devel libtermcap-devel libtiff3-devel libtiff-devel libungif4-devel libungif-devel libxml2-devel libxml-devel
+      libslang1-devel slang-devel sox-devel zlib1-devel zlib-devel libxfree86-devel dev86-devel
+      libgdk-pixbuf2-devel gdk-pixbuf-devel libgimp1.2_1-devel gimp-devel libgpm1-devel gpm-devel libghttp1-devel libghttp-devel libgtop2.0_1-devel libgtop2.0_0-devel libgtop-devel
+      libmikmod2-devel libmikmod-devel librep-devel libunicode-devel popt-devel libpwdb0-devel pwdb-devel t1lib1-devel t1lib-devel
+      libsnmp-devel mpeg_lib-devel WindowMaker-devel libaa1-devel libaa-devel libadns1-devel adns-devel
+      libalsa2-devel libalsa-devel libaudiofile0-devel audiofile-devel libcups2-devel cups-devel e2fsprogs-devel
+      libg-wrap1-devel g-wrap-devel gkrellm-devel libPropList-devel licq-devel openldap-devel
+      libparted1.6-devel parted-devel pciutils-devel pilot-link-devel svgalib-devel
+      recode-devel libaspell15-devel aspell-devel cracklib-devel faces-devel libfnlib0-devel fnlib-devel
+      libfreetype6-devel freetype-devel gtk+mdk-devel libgtkglarea5-devel gtkglarea-devel libxfree86-static-devel imap-devel
+      php432-devel php-devel libpth14-devel pth-devel libsane1-devel sane-devel swig-devel xdelta-devel isapnptools-devel
+      libpango1.0_0-devel pango-devel libreadline4-devel readline-devel
 
 MONITORING
   5 procinfo psacct
@@ -470,7 +472,7 @@ WEBMIN
 
 WIZARDS
   5 drakwizard
-  
+
 CONFIG
   3 ipvsadm quota nut
   2 gfcc adjtimex xinput timeconfig samba-swat
@@ -527,9 +529,9 @@ SYSTEM
   5 at MAKEDEV eject ldetect devfsd harddrake
     locales iputils urpmi cpio msec tmpwatch gnupg
 
-  5 HIGH_SECURITY libsafe kernel-secure lads
-  5 BIGMEM kernel-enterprise
-  5 SMP kernel-smp
+  5 HIGH_SECURITY libsafe kernel-secure-2.4.22.6mdk kernel-secure-2.4.22.7mdk kernel-secure lads
+  5 BIGMEM kernel-enterprise-2.4.22.6mdk kernel-enterprise-2.4.22.7mdk kernel-enterprise
+  5 SMP kernel-smp-2.4.22.6mdk kernel-smp-2.4.22.7mdk kernel-smp
   5 PCMCIA pcmcia-cs
   5 USB hotplug
 
@@ -539,6 +541,9 @@ SYSTEM
      HIGH_SECURITY NVIDIA_nforce-secure
      BIGMEM NVIDIA_nforce-enterprise
 
+  5 KDE kdeutils-kfloppy
+  5 KDE kdeutils-kdepasswd
+
   4 ftp-client-krb5 hexedit strace sudo grub procmail hdparm coreutils-doc
   4 PCMCIA netprofile
 
@@ -547,9 +552,9 @@ SYSTEM
   1 fdutils genromfs mailcap pinfo
 
   BOOKS 
-    5 man-pages-cs man-pages-de man-pages-es man-pages-fr man-pages-hu man-pages-id man-pages-it man-pages-ja man-pages-ko man-pages-pl man-pages-pt_BR man-pages-ru man-pages-zh
+    5 man-pages-cs man-pages-da man-pages-de man-pages-es man-pages-fr man-pages-hu man-pages-id man-pages-it man-pages-ja man-pages-ko man-pages-pl man-pages-pt_BR man-pages-ru man-pages-zh
     4 grub-doc lilo-doc
-      howto-html-de howto-html-fr
+      howto-html-de howto-html-el howto-html-en howto-html-es howto-html-fi howto-html-fr howto-html-hu howto-html-id howto-html-it howto-html-ja howto-html-ko howto-html-nl howto-html-pl howto-html-ro howto-html-sl howto-html-sv howto-html-zh
 
   4 NIS yp-tools
   3 PCMCIA irda-utils
@@ -563,7 +568,7 @@ EMULATORS
 
 INSTALL
   NOCOPY
-    5 kernel kernel-smp kernel-enterprise
+    5 kernel-2.4.22.6mdk kernel-2.4.22.7mdk kernel-2.4.22.7mdk kernel kernel-smp-2.4.22.6mdk kernel-smp-2.4.22.7mdk kernel-smp-2.4.22.7mdk kernel-smp kernel-enterprise-2.4.22.6mdk kernel-enterprise-2.4.22.7mdk kernel-enterprise-2.4.22.7mdk kernel-enterprise
       raidtools lvm reiserfsprogs jfsprogs xfsprogs 
       alsa-utils
     4 XFree86 brltty
@@ -574,8 +579,8 @@ INSTALL
     libhpojip0 libsnmp0 xojpanel libsane-hpoj1
     shorewall iptables printer-utils samba-client
     xpp printer-testpages nmap scli net-tools
-    autologin ntp ipchains 
-    cups printer-utils printer-testpages gimpprint xpp
+    ipchains 
+    cups gimpprint
     foomatic-db-engine foomatic-filters foomatic-db
     nc sndconfig 
     ImageMagick ghostscript printer-filters mpage a2ps ppdfilt libppd1 gpr groff libgimpprint1 numlock curl