/[smeserver]/rpms/e-smith-base/sme9/e-smith-base-5.4.0-do_not_remove_utf8.patch
ViewVC logotype

Contents of /rpms/e-smith-base/sme9/e-smith-base-5.4.0-do_not_remove_utf8.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (show annotations) (download)
Thu Jun 6 15:35:46 2013 UTC (11 years, 5 months ago) by vip-ire
Branch: MAIN
CVS Tags: e-smith-base-5_4_0-40_el6_sme, e-smith-base-5_4_0-44_el6_sme, e-smith-base-5_4_0-49_el6_sme, e-smith-base-5_4_0-37_el6_sme, e-smith-base-5_4_0-42_el6_sme, e-smith-base-5_4_0-43_el6_sme, e-smith-base-5_4_0-35_el6_sme, e-smith-base-5_4_0-36_el6_sme, e-smith-base-5_4_0-41_el6_sme, e-smith-base-5_4_0-50_el6_sme, e-smith-base-5_4_0-58_el6_sme, e-smith-base-5_4_0-45_el6_sme, e-smith-base-5_4_0-57_el6_sme, e-smith-base-5_4_0-46_el6_sme, e-smith-base-5_4_0-62_el6_sme, e-smith-base-5_4_0-39_el6_sme, e-smith-base-5_4_0-56_el6_sme, e-smith-base-5_4_0-52_el6_sme, e-smith-base-5_4_0-54_el6_sme, e-smith-base-5_4_0-51_el6_sme, e-smith-base-5_4_0-47_el6_sme, e-smith-base-5_4_0-55_el6_sme, e-smith-base-5_4_0-38_el6_sme, e-smith-base-5_4_0-53_el6_sme, e-smith-base-5_4_0-61_el6_sme, e-smith-base-5_4_0-60_el6_sme, e-smith-base-5_4_0-48_el6_sme, e-smith-base-5_4_0-59_el6_sme 
* Thu Jun 6 2013 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-35.sme
- Use UTF-8 in the console [SME: 7591]
1 diff -Nur e-smith-base-5.4.0/root/etc/e-smith/db/configuration/migrate/05sysconfig e-smith-base-5.4.0-utf-8/root/etc/e-smith/db/configuration/migrate/05sysconfig
2 --- e-smith-base-5.4.0/root/etc/e-smith/db/configuration/migrate/05sysconfig 2005-11-21 05:28:05.000000000 +0100
3 +++ e-smith-base-5.4.0-utf-8/root/etc/e-smith/db/configuration/migrate/05sysconfig 2013-05-18 11:47:41.605327053 +0200
4 @@ -4,7 +4,6 @@
5 close F;
6
7 my $lang = ($line =~ /^LANG="(.*)"/) ? $1 : "en-us";
8 - $lang =~ s/\.UTF-8$//;
9
10 my $kbdtype = "pc";
11 my $keytable = "us";
12 diff -Nur e-smith-base-5.4.0/root/etc/e-smith/templates/etc/sysconfig/i18n/LANG e-smith-base-5.4.0-utf-8/root/etc/e-smith/templates/etc/sysconfig/i18n/LANG
13 --- e-smith-base-5.4.0/root/etc/e-smith/templates/etc/sysconfig/i18n/LANG 2005-11-21 05:28:08.000000000 +0100
14 +++ e-smith-base-5.4.0-utf-8/root/etc/e-smith/templates/etc/sysconfig/i18n/LANG 2013-05-18 14:59:40.319511514 +0200
15 @@ -2,8 +2,10 @@
16 $OUT = "";
17 my $lang = $settings{LANG};
18 return unless defined $lang;
19 - if ($lang =~ /"(.*)\.UTF-8"/)
20 - {
21 - $settings{LANG} = '"' . $1 . '"';
22 + $lang =~ s/^['"]//;
23 + $lang =~ s/['"]$//;
24 + if ($lang !~ /\.UTF\-8$/)
25 + {
26 + $settings{LANG} = '"' . $lang . '.UTF-8"';
27 }
28 }
29 diff -Nur e-smith-base-5.4.0/root/etc/e-smith/templates/etc/sysconfig/i18n/SYSFONT e-smith-base-5.4.0-utf-8/root/etc/e-smith/templates/etc/sysconfig/i18n/SYSFONT
30 --- e-smith-base-5.4.0/root/etc/e-smith/templates/etc/sysconfig/i18n/SYSFONT 2005-11-21 05:28:08.000000000 +0100
31 +++ e-smith-base-5.4.0-utf-8/root/etc/e-smith/templates/etc/sysconfig/i18n/SYSFONT 2013-05-18 13:49:30.541877689 +0200
32 @@ -2,8 +2,8 @@
33 $OUT = "";
34 my $sysfont = $settings{SYSFONT};
35 return unless defined $sysfont;
36 - if ($sysfont eq '"latarcyrheb-sun16"')
37 + if ($sysfont eq '"lat0-sun16"')
38 {
39 - $settings{SYSFONT} = '"lat0-sun16"';
40 + $settings{SYSFONT} = '"latarcyrheb-sun16"';
41 }
42 }
43 diff -Nur e-smith-base-5.4.0/root/etc/e-smith/templates/etc/sysconfig/i18n/SYSFONTACM e-smith-base-5.4.0-utf-8/root/etc/e-smith/templates/etc/sysconfig/i18n/SYSFONTACM
44 --- e-smith-base-5.4.0/root/etc/e-smith/templates/etc/sysconfig/i18n/SYSFONTACM 2005-11-21 05:28:08.000000000 +0100
45 +++ e-smith-base-5.4.0-utf-8/root/etc/e-smith/templates/etc/sysconfig/i18n/SYSFONTACM 2013-05-18 13:50:08.093416513 +0200
46 @@ -1,8 +1,8 @@
47 {
48 $OUT = '';
49 - unless ($settings{SYSFONTACM})
50 + if ($settings{SYSFONTACM})
51 {
52 - $settings{SYSFONTACM} = '"iso15"';
53 - $order{scalar keys %settings} = "SYSFONTACM";
54 + $order{scalar keys %settings} = "SYSFONTACM";
55 + delete $order{scalar keys %settings};
56 }
57 }
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed