summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-09-19 13:40:59 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-09-19 13:40:59 +0000
commitb72a0266385128c33334eabe173633fce9e1f362 (patch)
tree925862d2193ec4a1daa52c6854063e7500e20e0a /perl-install
parent3c451111c10daade8ebb2720304fa02225a9a33f (diff)
downloaddrakx-b72a0266385128c33334eabe173633fce9e1f362.tar
drakx-b72a0266385128c33334eabe173633fce9e1f362.tar.gz
drakx-b72a0266385128c33334eabe173633fce9e1f362.tar.bz2
drakx-b72a0266385128c33334eabe173633fce9e1f362.tar.xz
drakx-b72a0266385128c33334eabe173633fce9e1f362.zip
- gmc instead of nautilus for non-latin1 installs
- introduce CHARSET flag and use it
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_any.pm1
-rw-r--r--perl-install/pkgs.pm6
-rw-r--r--perl-install/share/rpmsrate10
3 files changed, 11 insertions, 6 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index da9f376ee..2a5e591ab 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -400,6 +400,7 @@ sub setPackages {
foreach (lang::langsLANGUAGE($o->{langs})) {
$o->{compssUsersChoice}{qq(LOCALES"$_")} = 1;
}
+ $o->{compssUsersChoice}{'CHARSET"' . lang::lang2charset($o->{lang}) . '"'} = 1;
} else {
#- this has to be done to make sure necessary files for urpmi are
#- present.
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 9f097156f..2f0aeaaac 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -16,7 +16,7 @@ use c;
-my @preferred = qw(perl-GTK postfix proftpd ghostscript-X vim-minimal kernel db1 db2 ispell-en Bastille-Curses-module);
+my @preferred = qw(perl-GTK postfix proftpd ghostscript-X vim-minimal kernel db1 db2 ispell-en Bastille-Curses-module nautilus);
@preferred{@preferred} = ();
#- lower bound on the left ( aka 90 means [90-100[ )
@@ -786,8 +786,8 @@ sub computeGroupSize {
map { "$_&&$n" } @l;
} split('\|\|');
}
- #- HACK, remove LOCALES, too costly
- grep { !/LOCALES/ } @l;
+ #- HACK, remove LOCALES & CHARSET, too costly
+ grep { !/LOCALES|CHARSET/ } @l;
}
sub or_clean {
my (@l) = map { [ sort split('&&') ] } @_ or return '';
diff --git a/perl-install/share/rpmsrate b/perl-install/share/rpmsrate
index 8fb9bcc37..1da9a8317 100644
--- a/perl-install/share/rpmsrate
+++ b/perl-install/share/rpmsrate
@@ -8,7 +8,9 @@ GRAPHICAL_DESKTOP
GNOME
4 gnome-tiles gnome-users-guide gdm gnome-applets
- gnome-network gnome-utils nautilus xscreensaver
+ gnome-network gnome-utils xscreensaver
+ 4 CHARSET"iso-8859-1" || CHARSET"iso-8859-15" nautilus
+ 5 !CHARSET"iso-8859-1" !CHARSET"iso-8859-15" gmc
3 gnome-pilot sawfish-themes gtk-themes
2 bug-buddy eog g-print
1 sawfish-themer
@@ -241,7 +243,9 @@ NETWORKING_FILE_SERVER
NETWORKING_WWW
5 lynx
4 netscape-communicator wget links mozilla mozilla-psm netscape-plugins
- 4 GNOME screem galeon nautilus-mozilla
+ 4 GNOME
+ screem galeon
+ CHARSET"iso-8859-1" || CHARSET"iso-8859-15" nautilus-mozilla
3 plugger opera bluefish
4 netscape-castellano netscape-catalan netscape-chinese_gb2312 netscape-chinese_big5 netscape-euskara netscape-francais netscape-german netscape-japanese netscape-polish netscape-russian netscape-walon
NETWORKING_WWW_SERVER
@@ -455,7 +459,7 @@ X
5 GNOME ami-gnome
2 app-defaults-be app-defaults-cs app-defaults-ga app-defaults-ru app-defaults-th app-defaults-uk
- 4 LOCALES"lt" || LOCALES"lv" || LOCALES"mi" fonts-type1-baltic
+ 4 CHARSET"iso-8859-13" fonts-type1-baltic
LOCALES"ru" || LOCALES"uk" XFree86-cyrillic-fonts
LOCALES"he" fonts-hebrew-elmar
LOCALES"hy" fonts-ttf-armenian