1 files changed, 98 insertions, 57 deletions

diff --git a/perl-install/share/rpmsrate b/perl-install/share/rpmsrate
index 71964a6ba..211afb004 100644
--- a/perl-install/share/rpmsrate
+++ b/perl-install/share/rpmsrate
@@ -17,33 +17,40 @@ GNOME
   2 bug-buddy
 
 KDE
-  5 kdebase-progs kdebase-nsplugins mdkkdm galaxy-kde galaxy-kde-kwin mandrakegalaxy krozat kdeartwork-kde-classic kdeartwork
+  5 galaxy-kde galaxy-kde-kwin kdeartwork kdeartwork-kde-classic kdebase-nsplugins kdebase-progs krozat mandrakegalaxy
+  5 mdkkdm
+  1 kdebase-kdm
   5 kde-i18n-af kde-i18n-ar
   5 kdebase-servicemenu zip
-  5 kdeutils kdeutils-kcharselect
+  5 kdeutils-ark kdeutils-kcalc kdeutils-kcharselect kdeutils-kdf kdeutils-kfloppy kdeutils-kdepasswd
   5 kdepim-kontact
-  5 kdebase-kdm
-  5 kdeutils-kcalc
   5 kdeaddons-searchbar
   5 kdeutils-kwalletmanager
+  5 kdegraphics-kuickshow
+  3 kdeutils-kedit kdeutils-khexedit kdeutils-kjots kdeutils-ktimer
 
 VIDEO
-  5 totem
+  5 !KDE totem
+  5 KDE kaffeine
+  5 KDE kdenlive
   4 RealPlayer
-  4 KDE kdenlive
   3 xine-ui
   3 powerdvd
   3 xmms-smpeg mplayer-gui
   2 xmovie
 TV
-  5 tvtime
-  3 zapping ati.2
+  5 KDE kdetv
+  5 !KDE tvtime
+  3 xawtv
+  3 zapping
+  3 HW"ATI" ati.2
 
 OFFICE
   5 OpenOffice.org
   5 OpenOffice.org-help-cs OpenOffice.org-help-de
   5 OpenOffice.org-l10n-ar OpenOffice.org-l10n-ca
-  5 dia
+  5 KDE koffice-kivio
+  5 !KDE dia
   5 gnucash gnucash-hbci gnucash-ofx
   5 planner
   5 KDE kdenetwork-kdict
@@ -58,9 +65,9 @@ OFFICE
     5 kdepim-kaddressbook
     5 kdepim-knotes
     5 kdegraphics-kghostview
+    5 kdepim-kpilot
     3 koffice koffice-i18n-az koffice-i18n-bg
     3 kdegraphics-kdvi
-    3 kdepim-kpilot
   GNOME
     4 gnome-pim
     3 gnome-pilot-conduits Guppi
@@ -80,12 +87,12 @@ SOUND
 
 AUDIO
   5 KDE kdemultimedia-kscd
-  5 totem
+  5 KDE xine-arts amarok
   5 audacity
-  5 KDE xine-arts
   5 KDE kdemultimedia-kaudiocreator kdemultimedia-common
   5 gnome-media
   4 GNOME gnome-audio
+  4 KDE rosegarden4
   3 cdp
   3 cdparanoia
   3 cdrecord-cdda2wav
@@ -98,6 +105,17 @@ AUDIO
   3 timidity-instruments
   3 xmms
   3 DRIVER"^snd-" xmms-alsa gnome-alsamixer alsa-utils
+# the two following entries are for ISA sound cards and thus are not managed for now:
+  3 DRIVER"^snd-sb" cspctl
+  3 DRIVER"^sbawe" awesfx
+  3 DRIVER"snd-emu10k1" as10k1
+  3 DRIVER"snd-hdsp" hdsploader hdspmixer rmedigicontrol
+  3 DRIVER"snd-ice1712|snd-ice1724" envy24control
+# unmanaged ISA too:
+  3 DRIVER"snd-sscape" sscape_ctl
+  3 DRIVER"snd-mixart" mixartloader
+  3 DRIVER"snd-usb-audio" us428control usx2yloader
+  3 DRIVER"^snd-vx" vx-loader
   3 xmms-esd
   3 xmms-kjofol-skins
   3 xmms-more-vis-plugins
@@ -108,14 +126,19 @@ AUDIO
 
 
 ACCESSIBILITY
+  5 dasher
+  5 gnopernicus
+  5 gok
+  5 KDE kdeaccessibility
   2 gtkeyboard
 
 PUBLISHING
-  5 enscript ghostscript-module-X
+  5 scribus
+  5 enscript ghostscript-module-X 
   4 psutils texinfo
-  2 latex2html jadetex tetex-afm tetex-dvips tetex-latex tetex-xdvi tetex-latex-arab tetex-latex-heb docbook-dtd31-sgml
+  2 docbook-dtd31-sgml latex2html jadetex tetex-afm tetex-dvips tetex-latex tetex-xdvi tetex-latex-arab tetex-latex-heb 
   2 BOOKS tetex-doc
-  1 docbook-style-dsssl openjade cttex
+  1 cttex docbook-style-dsssl openjade 
   1 BOOKS docbook-style-dsssl-doc
 
 SHELLS
@@ -136,12 +159,10 @@ EDITORS
   4 emacs-X11
   3 GXedit
   3 KDE kdebase-kate
-  3 KDE kdeutils-kedit
-  3 KDE kdeutils-khexedit
   3 vim-X11
   3 yudit
-  2 nedit cooledit emacs-tramp joe emacs-leim jed-xjed xemacs xemacs-extras xemacs-info
-  1 emacs-el jed xemacs-el emacs-nox
+  2 cooledit emacs-tramp emacs-leim jed-xjed joe nedit xemacs xemacs-extras xemacs-info
+  1 emacs-el xemacs-el emacs-nox jed 
   GNOME
     4 gedit
 
@@ -157,6 +178,7 @@ TEXT_TOOLS
 COMMUNICATIONS
   5 efax
   5 gnomemeeting
+  5 KDE kphone
   4 KDE kdebase-kdeprintfax kdegraphics-kfax
   4 hylafax-client 
   3 jpilot pilot-link
@@ -212,7 +234,7 @@ NETWORKING_INSTANT_MESSAGING
     3 gtk+licq
 
 NETWORKING_IRC
-  5 xchat
+  3 xchat
   3 BitchX
   3 KDE kdenetwork-ksirc
   3 mozilla-irc
@@ -228,9 +250,9 @@ NETWORKING_GROUPWARE_SERVER
   3 phpgroupware
 
 NETWORKING_MAIL
-  5 mailx metamail
   5 KDE kdepim-kmail
   5 GNOME evolution
+  3 mailx metamail
   3 faces mozilla-mail
   3 fetchmail urlview mutt spamassassin
   3 !GNOME !KDE xmailbox
@@ -254,7 +276,6 @@ NETWORKING_NEWS_SERVER
   3 inews 
 
 NETWORKING_OTHER
-  5 KDE kdenetwork-kppp
   2 finger ucd-snmp-utils macutils
 
 NETWORKING_OTHER_SERVER
@@ -263,7 +284,7 @@ NETWORKING_OTHER_SERVER
   3 intimed nscd pidentd
     rdate bootparamd 
     cleanfeed ucd-snmp leafnode
-    cvsweb nut-server
+    cvsweb
     xorg-x11-Xvfb xorg-x11-Xnest
   2 diald finger-server mars-nwe
 
@@ -337,18 +358,19 @@ NETWORKING_WWW_SERVER
 
 GRAPHICS
   5 qiv
-  4 gimp2_0 gqview
-  4 KDE kdegraphics-ksnapshot
-  4 KDE kimdaba
+  5 gimp2_0 gimp-help-2
+  5 KDE kuickshow
+  5 !KDE gqview
+  5 KDE kdegraphics-ksnapshot
+  5 KDE digikam
+  4 !KDE flphoto gtkam
   4 KDE kdegraphics-common
   4 ImageMagick giftrans gphoto2
   3 gimp-data-extras
   3 BOOKS gimp-help
-  3 flphoto gtkam
   3 KDE kdeaddons-konqimagegallery
   3 KDE kdegraphics-kpaint
   3 KDE kdegraphics-kruler
-  3 KDE kdegraphics-kuickshow
   3 KDE kdegraphics-kview
   3 KDE kdegraphics-mrmlsearch
   3 skencil
@@ -363,7 +385,6 @@ GRAPHICS
 
 ARCHIVING
   5 unzip zip dump sharutils
-  5 KDE kdeutils-ark
   2 mt-st
   2 taper
   1 lha
@@ -373,7 +394,7 @@ ARCHIVING
 
 BURNER
   5 mkisofs cdrecord dvd+rw-tools
-  5 KDE k3b
+  5 KDE k3b-dvd kover
   5 GNOME nautilus-cd-burner
   4 !KDE !GNOME xcdroast
   3 gcombust
@@ -404,6 +425,7 @@ DATABASES
 GAMES
   5 frozen-bubble
   5 lbreakout2
+  5 supertux
   5 crack-attack crack-attack-music crack-attack-sounds
   3 clanbomber freeciv-client toppler
   3 cxhextris rocksndiamonds powermanga mures methane
@@ -516,13 +538,11 @@ DEVELOPMENT
 
 MONITORING
   5 procinfo psacct
-  5 PCMCIA apmd
   4 lsof swatch tcpdump traceroute
   4 nmap lm_sensors
   4 X nmap-frontend
-  3 KDE kdeutils-kdf
+  4 smartmontools
   3 KDE kdeutils-ksim
-  3 KDE kdeutils-ktimer
   3 iplog arpwatch lslk xcpustate xsysinfo pciutils
   2 cfengine gkrellm gps rusers mon 
   2 3D xtraceroute
@@ -554,12 +574,15 @@ BOOKS
   4 !LOCALES"fr" !LOCALES"it" !LOCALES"es" mandrake-doc-en
 
 X
-  5 xorg-x11 rxvt xorg-x11-75dpi-fonts urw-fonts fonts-ttf-vera
+  5 xorg-x11 xorg-x11-server rxvt xorg-x11-75dpi-fonts urw-fonts fonts-ttf-vera
   5 icewm-light
   5 HIGH_SECURITY mountloop
-  5 LOCALES"ja" scim-uim uim-applet
-  5 LOCALES"zh" scim-chinese scim-tables
-
+  5 LOCALES"zh" || LOCALES"am" scim-tables
+  5 LOCALES"ja" scim-uim
+  5 LOCALES"ko" scim-hangul
+  5 LOCALES"vi" x-unikey
+  5 LOCALES"zh" scim-chinese
+  
   4 vim-enhanced
   4 gurpmi rpmdrake drakconf userdrake fonts-ttf-decoratives fonts-ttf-west_european
     mandrake-mime menudrake mandrake_desk
@@ -573,13 +596,13 @@ X
   2 imlib-cfgeditor
   1 Mesa xtoolwait X11R6-contrib 
 
-  5 xcin xvnkb uim ami miniChinput
+  3 ami fcitx imhangul im-ja miniChinput nabi skim xcin xvnkb
 
   2 app-defaults-be app-defaults-cs
 
   5 LOCALES"ru" || LOCALES"uk" xorg-x11-cyrillic-fonts
     LOCALES"am" fonts-ttf-ethiopic
-    LOCALES"ar" || LOCALES"fa" || LOCALES"ur" fonts-ttf-arabic
+    LOCALES"ar" || LOCALES"fa" || LOCALES"ur" fonts-ttf-arabic-arabeyes fonts-ttf-arabic-farsi fonts-ttf-arabic-kacst
     LOCALES"as" || LOCALES"bn" fonts-ttf-bengali
     LOCALES"el" fonts-type1-greek
     LOCALES"he" || LOCALES"yi" fonts-hebrew-elmar fonts-type1-hebrew
@@ -596,45 +619,60 @@ DOCS
   5 man info man-pages
 
 SYSTEM
-  5 at eject ldetect devfsd harddrake
+  5 at eject ldetect harddrake udev s2u sharutils
     locales iputils urpmi cpio msec tmpwatch gnupg
 
-  5 lshw OpenIPMI dmidecode
+  5 lshw dmidecode
 
   5 HIGH_SECURITY libsafe kernel-secure lads
-  5 BIGMEM kernel-i686-up-4GB
+  5 BIGMEM kernel
   5 SMP kernel-smp
-  5 BIGMEM SMP kernel-p3-smp-64GB
+  5 BIGMEM SMP kernel-enterprise
   5 PCMCIA pcmcia-cs
   5 USB hotplug
 
+  5 HW"HighPoint Technologies Inc.\|HPT37|Promise Technology.*FastTrak" || DRIVER"ata_piix|i2o_block|megaraid|sata_sil" mdadm dmraid
+  5 HW"American Power Conversion\|Back-UPS Pro 500|MGE UPS Systems\|" nut-server
   5 HW"iKey 3000 Token" rnboifd
+  5 DRIVER"slamr|slusb|snd-atiixp-modem|snd-intel8x0m|snd-via82xx-modem" slmodem
+  5 DRIVER"^LT:|slamr|slusb|^Hcf:|^Hsf:" ppp
+      KDE kdenetwork-kppp
+  5 DRIVER"^LT:" ltmodem
   5 HW"OmniKey Cardman"
      cm2020
      SMP cm2020-smp
      HIGH_SECURITY cm2020-secure
      BIGMEM cm2020-enterprise
 
-  5 KDE kdeutils-kfloppy
-  5 KDE kdeutils-kdepasswd
-
   5 GNOME || KDE magicdev
 
-  5 DRIVER"^ISDN:" ibod isdn4net isdn-light isdn4k-utils
+  5 DRIVER"slamr|slusb" slmodem-kernel
+  5 DRIVER"^ISDN:" ibod isdn4net isdn4k-utils
   5 DRIVER"adiusbadsl" eagle-usb
+  5 KDE  DRIVER"bcm203x|bfusb|hci_usb" kdebluetooth 
+  5 !KDE DRIVER"bcm203x|bfusb|hci_usb" gnome-bluetooth
+  5 DRIVER"ipw2100" ipw2100-firmware
+  5 DRIVER"ipw2200" ipw2200-firmware
+  5 DRIVER"ath_pci" madwifi-kernel madwifi
   5 DRIVER"speedtch" speedtouch speedtouch_mgmt
+  5 DRIVER"^Hcf:" hcfmodem
+  5 DRIVER"^Hsf:" hsfmodem
   5 DRIVER"^ISDN:|^Hcf:|^Hsf:|^LT:|speedtch"
       kernel-2.4
       SMP kernel-smp-2.4
       BIGMEM kernel-enterprise-2.4
 
-  5 HW"Intel Corp\.\|PRO/Wireless LAN" ndiswrapper
-
+  5 atmel-firmware prism54-firmware
+  5 bluez-utils
+  
+  5 KDE TYPE"laptop" kdeutils-klaptop
+  5 TYPE"laptop" cpufreq apmd
+  
   4 ftp-client-krb5 hexedit strace sudo grub procmail hdparm coreutils-doc
-  4 PCMCIA netprofile
+  4 TYPE"laptop" netprofile
 
   3 bc
-  2 sndconfig acpid adns audiofile freeswan awesfx fbset vlan-utils gpm
+  2 sndconfig acpid adns audiofile freeswan fbset vlan-utils gpm
   1 fdutils genromfs mailcap pinfo
 
   BOOKS 
@@ -643,7 +681,7 @@ SYSTEM
       howto-html-de howto-html-el
 
   4 NIS yp-tools
-  3 PCMCIA irda-utils
+  3 TYPE"laptop" irda-utils
   3 USB usbutils
 
   4 LOCALES"ar" || LOCALES"fa" || LOCALES"he" || LOCALES"yi" acon
@@ -662,21 +700,24 @@ PRINTER
 INSTALL
   NOCOPY
     5 kernel kernel-smp kernel-i686-up-4GB
-      raidtools lvm2 reiserfsprogs jfsprogs xfsprogs 
-      alsa-utils
-    4 xorg-x11 brltty
+      mdadm lvm2 reiserfsprogs jfsprogs xfsprogs 
+      alsa-utils xorg-x11 xorg-x11-server 
+    4 brltty
 
   5 pptp-adsl dhcpcd dhcpxd dhcp-client rp-pppoe pump
     ppp nfs-utils-clients libiw27 wireless-tools ppp-pppoe ppp-pppoatm
     autologin ntp samba-server ncpfs ucd-snmp libptal0
-    shorewall iptables samba-client
+    shorewall iptables samba-client perl-Net-DNS
     ipchains nc sndconfig curl
     mtools mtoolsfm numlock usbutils
     hotplug ypbind
+    autofs pam_ldap pam_krb5 libsasl2-plug-gssapi nss_ldap openldap-clients samba-winbind
     tmdns zcip acpi acpid
     ibod isdn4net isdn-light isdn4k-utils kernel-2.4
     eagle-usb
     speedtouch speedtouch_mgmt
+    kdenetwork-kppp-provider
+    synaptics dkms-minimal
 
   5 cups cups-drivers hpoj libhpojip0
-  4 xorg-x11-server xorg-x11-glide-module Glide_V3-DRI Glide_V5 Mesa
+  4 xorg-x11-glide-module Glide_V3-DRI Glide_V5 Mesa