clean-ups (factor out) + fixes for lib64 packages

1 files changed, 53 insertions, 54 deletions

diff --git a/perl-install/share/rpmsrate.corpo-desktop b/perl-install/share/rpmsrate.corpo-desktop
index 8a9988f49..a31b7ccdd 100644
--- a/perl-install/share/rpmsrate.corpo-desktop
+++ b/perl-install/share/rpmsrate.corpo-desktop
@@ -17,8 +17,8 @@ GNOME
   2 bug-buddy
 
 KDE
-  5 kdebase-progs kdebase-nsplugins mdkkdm galaxy-kde galaxy-kde-kwin mandrake-galaxy krozat kdeartwork-kde-classic kdeartwork
-  5 kde-i18n-af kde-i18n-ar kde-i18n-az kde-i18n-be kde-i18n-bg 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-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-nb 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-th kde-i18n-tr kde-i18n-uk kde-i18n-uz kde-i18n-vi kde-i18n-wa kde-i18n-zh_CN.GB2312 kde-i18n-zh_TW.Big5 kde-i18n-zu
+  5 kdebase-progs kdebase-nsplugins mdkkdm 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
   5 kdebase-kdm
@@ -42,8 +42,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-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-et OpenOffice.org-l10n-eu OpenOffice.org-l10n-fi OpenOffice.org-l10n-fr 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-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 OpenOffice.org-help-cs OpenOffice.org-help-de
+  5 OpenOffice.org-l10n-ar OpenOffice.org-l10n-ca
   5 dia
   5 gnucash gnucash-hbci gnucash-ofx
   5 planner
@@ -60,7 +60,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-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-af koffice-i18n-az
     3 kdegraphics-kdvi
   GNOME
     4 gnome-pim
@@ -68,10 +68,10 @@ OFFICE
     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-hu aspell-it aspell-nl aspell-no aspell-pl aspell-pt aspell-ro aspell-ru aspell-sk aspell-sv aspell-uk
-  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_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
+  5 aspell-br aspell-ca
+  5 ispell-af ispell-en
+  5 myspell-bg_BG myspell-ca_ES
+  5 myspell-hyph-cs myspell-hyph-da
 
 SOUND
   5 KDE kdemultimedia-kmix
@@ -434,7 +434,7 @@ DEVELOPMENT
   2 gperf indent
   1 glibc-profile xxgdb
 
-  4 gcc-c++ libstdc++5-devel libstdc++-devel
+  4 gcc-c++ libstdc++-devel
   2 libsigc++-examples
 
   4 bison flex
@@ -451,7 +451,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 
@@ -480,18 +480,18 @@ 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
-      libquanta0-kommander-devel libkoffice2-devel koffice-devel
+      libkdemultimedia1-noatun-devel kdevelop-devel arts-devel
+      qt-devel quanta-devel libquanta0-kfilereplace-devel
+      libquanta0-kommander-devel koffice-devel
 
   GNOME
     4 perl-GTK-Glade perl-GTK-Gnome 
@@ -501,20 +501,20 @@ DEVELOPMENT
     1 libgnucash0-devel 
 
   DEVELOPMENT_OTHER
-    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_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 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 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
 
 MONITORING
   5 procinfo psacct
@@ -551,7 +551,7 @@ CONFIG
   1 ipxutils
 
 BOOKS
-  4 mandrake-doc-de mandrake-doc-es mandrake-doc-fr mandrake-doc-it mandrake-doc-ru mandrake-doc-zh_cn
+  4 mandrake-doc-de mandrake-doc-es
   4 !LOCALES"fr" !LOCALES"it" !LOCALES"es" mandrake-doc-en
 
 X
@@ -580,7 +580,7 @@ X
 
   5 xcin xvnkb FreeWnn ami kinput2-wnn4 miniChinput
 
-  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"mi" || LOCALES"lt" || LOCALES"lv" fonts-type1-baltic
     LOCALES"ru" || LOCALES"uk" XFree86-cyrillic-fonts
@@ -607,25 +607,25 @@ SYSTEM
 
   5 lshw OpenIPMI dmidecode
 
-  5 HIGH_SECURITY libsafe kernel-secure-2.6.3.16mdk kernel-secure lads
-  5 BIGMEM kernel-i686-up-4GB-2.6.3.16mdk kernel-i686-up-4GB
-  5 SMP kernel-smp-2.6.3.16mdk kernel-smp
-  5 BIGMEM SMP kernel-p3-smp-64GB-2.6.3.16mdk kernel-p3-smp-64GB
+  5 HIGH_SECURITY libsafe kernel-secure lads
+  5 BIGMEM kernel-i686-up-4GB
+  5 SMP kernel-smp
+  5 BIGMEM SMP kernel-p3-smp-64GB
   5 PCMCIA pcmcia-cs
   5 USB hotplug
 
   5 HW"nForce.*(?:Audio|Network)" 
-     NVIDIA_nforce-2.4.25.7mdk NVIDIA_nforce
-     SMP NVIDIA_nforce-smp-2.4.25.7mdk NVIDIA_nforce-smp
-     HIGH_SECURITY NVIDIA_nforce-secure-2.4.25.7mdk NVIDIA_nforce-secure
-     BIGMEM NVIDIA_nforce-enterprise-2.4.25.7mdk NVIDIA_nforce-enterprise
+     NVIDIA_nforce
+     SMP NVIDIA_nforce-smp
+     HIGH_SECURITY NVIDIA_nforce-secure
+     BIGMEM NVIDIA_nforce-enterprise
 
   5 HW"iKey 3000 Token" rnboifd
   5 HW"OmniKey Cardman"
-     cm2020-2.4.25.7mdk cm2020
-     SMP cm2020-smp-2.4.25.7mdk cm2020-smp
-     HIGH_SECURITY cm2020-secure-2.4.25.7mdk cm2020-secure
-     BIGMEM cm2020-enterprise-2.4.25.7mdk cm2020-enterprise
+     cm2020
+     SMP cm2020-smp
+     HIGH_SECURITY cm2020-secure
+     BIGMEM cm2020-enterprise
 
   5 KDE kdeutils-kfloppy
   5 KDE kdeutils-kdepasswd
@@ -636,9 +636,9 @@ SYSTEM
   5 DRIVER"adiusbadsl" eagle-usb
   5 DRIVER"speedtch" speedtouch speedtouch_mgmt
   5 DRIVER"^ISDN:|^Hcf:|^Hsf:|^LT:|speedtch"
-      kernel-2.4.25.8mdk kernel-2.4
-      SMP kernel-smp-2.4.25.8mdk kernel-smp-2.4
-      BIGMEM kernel-enterprise-2.4.25.8mdk kernel-enterprise-2.4
+      kernel-2.4
+      SMP kernel-smp-2.4
+      BIGMEM kernel-enterprise-2.4
 
   5 HW"Intel Corp.|PRO/Wireless LAN" ndiswrapper
 
@@ -650,9 +650,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 PCMCIA irda-utils
@@ -673,7 +673,7 @@ PRINTER
 
 INSTALL
   NOCOPY
-    5 kernel-2.6.3.16mdk kernel kernel-smp-2.6.3.16mdk kernel-smp kernel-i686-up-4GB-2.6.3.16mdk kernel-i686-up-4GB
+    5 kernel kernel-smp kernel-i686-up-4GB
       raidtools lvm2 reiserfsprogs jfsprogs xfsprogs 
       alsa-utils
     4 XFree86 brltty
@@ -687,7 +687,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.25.8mdk kernel-2.4
+    ibod isdn4net isdn-light isdn4k-utils kernel-2.4
     eagle-usb
     speedtouch speedtouch_mgmt
 
@@ -697,4 +697,3 @@ INSTALL
   3 XFree86-S3 XFree86-S3V XFree86-VGA16
   2 XFree86-8514 XFree86-AGX XFree86-I128 XFree86-Mach32 XFree86-Mach8 XFree86-Mono XFree86-P9000 XFree86-W32
   1 XFree86-3DLabs
-