revert part of the commit that was not done on purpose

(nb: don't modify rpmsrate *after* running clean-rpmsrate)

1 files changed, 54 insertions, 62 deletions

diff --git a/perl-install/share/rpmsrate b/perl-install/share/rpmsrate
index 057d5203d..daa5d3028 100644
--- a/perl-install/share/rpmsrate
+++ b/perl-install/share/rpmsrate
@@ -20,22 +20,14 @@ KDE
   5 galaxy-kde galaxy-kde-kwin kdeartwork kdeartwork-kde-classic kdebase-nsplugins kdebase-progs krozat mandrakegalaxy
   1 mdkkdm
   5 kdebase-kdm
-  5 kde-i18n-af kde-i18n-ar kde-i18n-az kde-i18n-be kde-i18n-bg kde-i18n-bn kde-i18n-br kde-i18n-bs kde-i18n-ca kde-i18n-cs kde-i18n-cy kde-i18n-da kde-i18n-de kde-i18n-el kde-i18n-en_GB kde-i18n-eo kde-i18n-es kde-i18n-et kde-i18n-eu kde-i18n-fa kde-i18n-fi kde-i18n-fo kde-i18n-fr kde-i18n-ga kde-i18n-gl kde-i18n-he kde-i18n-hi kde-i18n-hr kde-i18n-hu kde-i18n-id kde-i18n-is kde-i18n-it kde-i18n-ja kde-i18n-ko kde-i18n-lo kde-i18n-lt kde-i18n-lv kde-i18n-mi kde-i18n-mk kde-i18n-mn kde-i18n-ms kde-i18n-mt kde-i18n-nb kde-i18n-nds kde-i18n-nl kde-i18n-nn kde-i18n-oc kde-i18n-pl kde-i18n-pt kde-i18n-pt_BR kde-i18n-ro kde-i18n-ru kde-i18n-se kde-i18n-sk kde-i18n-sl kde-i18n-sr kde-i18n-sv kde-i18n-ta kde-i18n-tg kde-i18n-th kde-i18n-tr kde-i18n-uk kde-i18n-uz kde-i18n-vi kde-i18n-wa kde-i18n-xh kde-i18n-zh_CN.GB2312 kde-i18n-zh_TW.Big5 kde-i18n-zu
+  5 kde-i18n-af kde-i18n-ar
   5 kdebase-servicemenu zip
-  5 kdeutils-ark
-  5 kdeutils-kcalc
-  5 kdeutils-kcharselect
-  5 kdeutils-kdf
-  5 kdeutils-kfloppy
-  5 kdeutils-kdepasswd
+  5 kdeutils-ark kdeutils-kcalc kdeutils-kcharselect kdeutils-kdf kdeutils-kfloppy kdeutils-kdepasswd
   5 kdepim-kontact
   5 kdeaddons-searchbar
   5 kdeutils-kwalletmanager
   5 kdegraphics-kuickshow
-  3 kdeutils-kedit
-  3 kdeutils-khexedit 
-  3 kdeutils-kjots
-  3 kdeutils-ktimer
+  3 kdeutils-kedit kdeutils-khexedit kdeutils-kjots kdeutils-ktimer
 
 VIDEO
   5 !KDE totem
@@ -55,8 +47,8 @@ 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-eu OpenOffice.org-help-fi OpenOffice.org-help-fr OpenOffice.org-help-it OpenOffice.org-help-ja OpenOffice.org-help-ko OpenOffice.org-help-nl OpenOffice.org-help-ru OpenOffice.org-help-sk OpenOffice.org-help-sl OpenOffice.org-help-sv OpenOffice.org-help-zh_CN OpenOffice.org-help-zh_TW
-  5 OpenOffice.org-l10n-af OpenOffice.org-l10n-ar OpenOffice.org-l10n-ca OpenOffice.org-l10n-cs OpenOffice.org-l10n-cy OpenOffice.org-l10n-da OpenOffice.org-l10n-de OpenOffice.org-l10n-el OpenOffice.org-l10n-en OpenOffice.org-l10n-es OpenOffice.org-l10n-et OpenOffice.org-l10n-eu OpenOffice.org-l10n-fi OpenOffice.org-l10n-fr OpenOffice.org-l10n-he OpenOffice.org-l10n-it OpenOffice.org-l10n-ja OpenOffice.org-l10n-ko OpenOffice.org-l10n-nb OpenOffice.org-l10n-nl OpenOffice.org-l10n-nn OpenOffice.org-l10n-ns OpenOffice.org-l10n-pl OpenOffice.org-l10n-pt OpenOffice.org-l10n-pt_BR OpenOffice.org-l10n-ru OpenOffice.org-l10n-sk OpenOffice.org-l10n-sl OpenOffice.org-l10n-sv OpenOffice.org-l10n-tr OpenOffice.org-l10n-zh_CN OpenOffice.org-l10n-zh_TW OpenOffice.org-l10n-zu
+  5 OpenOffice.org-help-cs OpenOffice.org-help-de
+  5 OpenOffice.org-l10n-ar OpenOffice.org-l10n-ca
   5 KDE koffice-kivio
   5 !KDE dia
   5 gnucash gnucash-hbci gnucash-ofx
@@ -74,7 +66,7 @@ OFFICE
     5 kdepim-knotes
     5 kdegraphics-kghostview
     5 kdepim-kpilot
-    3 koffice koffice-i18n-af koffice-i18n-az koffice-i18n-bg koffice-i18n-ca koffice-i18n-cs koffice-i18n-da koffice-i18n-de koffice-i18n-el koffice-i18n-en_GB koffice-i18n-eo koffice-i18n-es koffice-i18n-et koffice-i18n-fa koffice-i18n-fi koffice-i18n-fr koffice-i18n-he koffice-i18n-hu koffice-i18n-it koffice-i18n-ja koffice-i18n-lo 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-se koffice-i18n-sk koffice-i18n-sl koffice-i18n-sr koffice-i18n-sv koffice-i18n-ta koffice-i18n-tr koffice-i18n-uk koffice-i18n-zh_CN koffice-i18n-zh_TW koffice-i18n-zu
+    3 koffice koffice-i18n-az koffice-i18n-bg
     3 kdegraphics-kdvi
   GNOME
     4 gnome-pim
@@ -82,10 +74,10 @@ OFFICE
     2 ggv 
 
 SPELLCHECK
-  5 aspell-af aspell-be aspell-bg aspell-br aspell-ca aspell-cs aspell-cy aspell-da aspell-de aspell-el aspell-en aspell-eo aspell-es aspell-fi aspell-fo aspell-fr aspell-ga aspell-gd aspell-gl aspell-gv aspell-hr aspell-hu aspell-id aspell-is aspell-it aspell-mi aspell-mk aspell-ms aspell-mt aspell-nl aspell-nn aspell-no aspell-pl aspell-pt aspell-ro aspell-ru aspell-sc aspell-sk aspell-sl aspell-sv aspell-sw aspell-tr aspell-uk aspell-wa aspell-zu
+  5 aspell-br aspell-ca
   5 ispell-af ispell-en
-  5 myspell-af_ZA myspell-bg_BG myspell-ca_ES myspell-cs_CZ myspell-cy_GB 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_NZ myspell-en_US myspell-es_ES myspell-es_MX myspell-et_EE myspell-fo_FO myspell-fr_BE myspell-fr_FR myspell-ga_IE myspell-gl_ES myspell-hr_HR myspell-hu_HU myspell-id_ID myspell-it_IT myspell-lt_LT myspell-mi_NZ myspell-ms_MY myspell-nb_NO myspell-nl_NL myspell-nn_NO myspell-pl_PL myspell-pt_BR myspell-pt_PT myspell-ro_RO myspell-ru_RU myspell-sk_SK myspell-sl_SI myspell-sv_SE myspell-sw_KE myspell-tn_ZA myspell-uk_UA myspell-zu_ZA
-  5 myspell-hyph-bg myspell-hyph-cs myspell-hyph-da myspell-hyph-de myspell-hyph-el myspell-hyph-en myspell-hyph-es myspell-hyph-et myspell-hyph-fi myspell-hyph-fr myspell-hyph-ga myspell-hyph-hu myspell-hyph-id myspell-hyph-is myspell-hyph-it myspell-hyph-lt myspell-hyph-nl myspell-hyph-pl myspell-hyph-pt myspell-hyph-ru myspell-hyph-sk myspell-hyph-sl myspell-hyph-sv myspell-hyph-uk
+  5 myspell-bg_BG myspell-ca_ES
+  5 myspell-hyph-cs myspell-hyph-da
 
 SOUND
   5 KDE kdemultimedia-kmix
@@ -99,8 +91,8 @@ AUDIO
   5 audacity
   5 KDE kdemultimedia-kaudiocreator kdemultimedia-common
   5 gnome-media
-  5 GNOME gnome-audio
-  5 KDE rosegarden4
+  4 GNOME gnome-audio
+  4 KDE rosegarden4
   3 cdp
   3 cdparanoia
   3 cdrecord-cdda2wav
@@ -113,13 +105,13 @@ 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
@@ -363,7 +355,7 @@ NETWORKING_WWW_SERVER
   4 BOOKS apache2-manual
   3 php-gd php-imap php-ldap php-mysql
     php-pgsql php-readline php_cgi mod_sxnet HTML-Embperl
-  3 BOOKS php-manual-de php-manual-en php-manual-es php-manual-fr php-manual-it
+  3 BOOKS php-manual-en php-manual-fr
 
 GRAPHICS
   5 qiv
@@ -429,7 +421,7 @@ DATABASES
   DEVELOPMENT 
     4 perl-Mysql
     3 postgresql-devel
-    1 MySQL-bench libmysql12-devel libmysql-devel
+    1 MySQL-bench libmysql-devel
 
 GAMES
   5 frozen-bubble
@@ -463,7 +455,7 @@ DEVELOPMENT
   2 gperf indent
   1 glibc-profile xxgdb
 
-  4 gcc-c++ libstdc++6-devel libstdc++-devel
+  4 gcc-c++ libstdc++-devel
   2 libsigc++-examples
 
   4 bison flex
@@ -480,7 +472,7 @@ DEVELOPMENT
   3 swig
 
   4 python tkinter
-  3 libpython2.3-devel python-devel python-imaging pygtk-glarea pygtk pygtk-libglade rpm-python
+  3 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 
@@ -509,17 +501,17 @@ DEVELOPMENT
     5 kdesdk
     5 libkdenetwork2-kopete-devel libkdebase4-kate-devel libkdepim2-common-devel
       libkdebase4-nsplugins-devel libkdepim2-kaddressbook-devel
-      libkdepim2-kmail-devel libkdecore4-devel kdecore-devel libkdepim2-knode-devel
-      libkdeedu1-devel kdeedu-devel libkdepim2-kontact-devel libkdegames1-devel
+      libkdepim2-kmail-devel kdecore-devel libkdepim2-knode-devel
+      kdeedu-devel libkdepim2-kontact-devel libkdegames1-devel
       libkdepim2-korganizer-devel libkdegraphics0-common-devel
       libkdepim2-kpilot-devel libkdegraphics0-kooka-devel
       libkdesdk1-cervisia-devel libkdegraphics0-kpovmodeler-devel
-      libkdesdk1-devel kdesdk-devel libkdegraphics0-ksvg-devel libkdesdk1-kbabel-devel
-      libkdegraphics0-kview-devel libkdetoys1-devel kdetoys-devel
+      kdesdk-devel libkdegraphics0-ksvg-devel libkdesdk1-kbabel-devel
+      libkdegraphics0-kview-devel kdetoys-devel
       libkdemultimedia1-common-devel libkdeutils1-common-devel
       libkdemultimedia1-kscd-devel libkdeutils1-ksim-devel
-      libkdemultimedia1-noatun-devel libkdevelop3-devel kdevelop-devel libarts1-devel arts-devel
-      libqt3-devel qt-devel libquanta0-devel quanta-devel libquanta0-kfilereplace-devel
+      libkdemultimedia1-noatun-devel kdevelop-devel arts-devel
+      qt-devel quanta-devel libquanta0-kfilereplace-devel
       libquanta0-kommander-devel koffice-devel
 
   GNOME
@@ -530,20 +522,20 @@ DEVELOPMENT
     1 libgnucash0-devel 
 
   DEVELOPMENT_OTHER
-    2 libMagick6.4.0-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 libxorg-x11-devel dev86-devel
-      libgdk-pixbuf2-devel gdk-pixbuf-devel libgimp2.0-devel gimp-devel libgpm1-devel gpm-devel libghttp1-devel libghttp-devel libgtop2.0_2-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 libWindowMaker0-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
-      librecode0-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 libxorg-x11-static-devel imap-devel
-      php432-devel php-devel libpth20-devel pth-devel libsane1-devel sane-devel swig-devel xdelta-devel isapnptools-devel
-      libpango1.0_0-devel pango-devel libreadline4-devel readline-devel
+    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
+      slang-devel sox-devel zlib-devel libxorg-x11-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 libxorg-x11-static-devel imap-devel
+      php-devel pth-devel sane-devel swig-devel xdelta-devel isapnptools-devel
+      pango-devel readline-devel
 
 MONITORING
   5 procinfo psacct
@@ -579,7 +571,7 @@ CONFIG
   1 ipxutils
 
 BOOKS
-  4 mandrake-doc-de mandrake-doc-es mandrake-doc-fr mandrake-doc-it mandrake-doc-zh_cn
+  4 mandrake-doc-de mandrake-doc-es
   4 !LOCALES"fr" !LOCALES"it" !LOCALES"es" mandrake-doc-en
 
 X
@@ -591,7 +583,7 @@ X
   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
@@ -607,7 +599,7 @@ X
 
   1 ami fcitx imhangul im-ja miniChinput nabi skim xcin xvnkb
 
-  2 app-defaults-be app-defaults-cs app-defaults-ga app-defaults-ru app-defaults-th app-defaults-uk
+  2 app-defaults-be app-defaults-cs
 
   5 LOCALES"ru" || LOCALES"uk" xorg-x11-cyrillic-fonts
     LOCALES"am" fonts-ttf-ethiopic
@@ -633,10 +625,10 @@ SYSTEM
 
   5 lshw dmidecode
 
-  5 HIGH_SECURITY libsafe kernel-secure-2.6.8.1.11mdk kernel-secure lads
-  5 BIGMEM kernel-2.6.8.1.11mdk kernel
-  5 SMP kernel-smp-2.6.8.1.11mdk kernel-smp
-  5 BIGMEM SMP kernel-enterprise-2.6.8.1.11mdk kernel-enterprise
+  5 HIGH_SECURITY libsafe kernel-secure lads
+  5 BIGMEM kernel
+  5 SMP kernel-smp
+  5 BIGMEM SMP kernel-enterprise
   5 PCMCIA pcmcia-cs
   5 USB hotplug
 
@@ -653,7 +645,7 @@ SYSTEM
 
   5 GNOME || KDE magicdev
 
-  5 DRIVER"slamr|slusb" slmodem-kernel--------------------------- slmodem-kernel-------------------------- slmodem-kernel-------------------------- slmodem-kernel------------------------- slmodem-kernel------------------------- slmodem-kernel------------------------ slmodem-kernel------------------------ slmodem-kernel----------------------- slmodem-kernel----------------------- slmodem-kernel---------------------- slmodem-kernel---------------------- slmodem-kernel--------------------- slmodem-kernel--------------------- slmodem-kernel-------------------- slmodem-kernel-------------------- slmodem-kernel------------------- slmodem-kernel------------------- slmodem-kernel------------------ slmodem-kernel------------------ slmodem-kernel----------------- slmodem-kernel----------------- slmodem-kernel---------------- slmodem-kernel---------------- slmodem-kernel--------------- slmodem-kernel--------------- slmodem-kernel-------------- slmodem-kernel-------------- slmodem-kernel------------- slmodem-kernel------------- slmodem-kernel------------ slmodem-kernel------------ slmodem-kernel----------- slmodem-kernel----------- slmodem-kernel---------- slmodem-kernel---------- slmodem-kernel--------- slmodem-kernel--------- slmodem-kernel-------- slmodem-kernel-------- slmodem-kernel------- slmodem-kernel------- slmodem-kernel------ slmodem-kernel------ slmodem-kernel----- slmodem-kernel----- slmodem-kernel---- slmodem-kernel---- slmodem-kernel--- slmodem-kernel--- slmodem-kernel-- slmodem-kernel-- slmodem-kernel- slmodem-kernel- slmodem-kernel
+  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 
@@ -663,16 +655,16 @@ SYSTEM
   5 DRIVER"ath_pci" madwifi_kernel madwifi
   5 DRIVER"speedtch" speedtouch speedtouch_mgmt
   5 DRIVER"^ISDN:|^Hcf:|^Hsf:|^LT:|speedtch"
-      kernel-2.4.27.0.pre2.1mdk kernel-2.4
-      SMP kernel-smp-2.4.27.0.pre2.1mdk kernel-smp-2.4
-      BIGMEM kernel-enterprise-2.4.27.0.pre2.1mdk kernel-enterprise-2.4
+      kernel-2.4
+      SMP kernel-smp-2.4
+      BIGMEM kernel-enterprise-2.4
 
   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 TYPE"laptop" netprofile
 
@@ -681,9 +673,9 @@ SYSTEM
   1 fdutils genromfs mailcap pinfo
 
   BOOKS 
-    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
+    5 man-pages-cs man-pages-da
     4 grub-doc lilo-doc
-      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
+      howto-html-de howto-html-el
 
   4 NIS yp-tools
   3 TYPE"laptop" irda-utils
@@ -704,7 +696,7 @@ PRINTER
 
 INSTALL
   NOCOPY
-    5 kernel-2.6.8.1.11mdk kernel kernel-smp-2.6.8.1.11mdk kernel-smp kernel-i686-up-4GB-2.4.27.0.pre2.1mdk kernel-i686-up-4GB
+    5 kernel kernel-smp kernel-i686-up-4GB
       mdadm lvm2 reiserfsprogs jfsprogs xfsprogs 
       alsa-utils xorg-x11 xorg-x11-server 
     4 brltty
@@ -718,7 +710,7 @@ INSTALL
     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.27.0.pre2.1mdk kernel-2.4
+    ibod isdn4net isdn-light isdn4k-utils kernel-2.4
     eagle-usb
     speedtouch speedtouch_mgmt
     kdenetwork-kppp-provider