Hello community, here is the log from the commit of package OpenOffice_org-l10n for openSUSE:Factory checked in at Thu Dec 10 12:59:20 CET 2009. -------- --- OpenOffice_org-l10n/OpenOffice_org-l10n.changes 2009-11-13 18:37:22.000000000 +0100 +++ /mounts/work_src_done/STABLE/OpenOffice_org-l10n/OpenOffice_org-l10n.changes 2009-12-07 22:29:59.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Dec 7 17:53:37 CET 2009 - pmladek@suse.cz + +- updated to version 3.1.99.4 +- used the renamed "gu" instead of "gu-IN" lang code; kept the package + name to keep the backward compatibility + +------------------------------------------------------------------- +Tue Nov 24 16:57:27 CET 2009 - pmladek@suse.cz + +- updated to version 3.1.99.3 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-l10n.spec ++++++ ++++ 844 lines (skipped) ++++ between OpenOffice_org-l10n/OpenOffice_org-l10n.spec ++++ and /mounts/work_src_done/STABLE/OpenOffice_org-l10n/OpenOffice_org-l10n.spec ++++++ ooo-l10n-gen-spec ++++++ --- /var/tmp/diff_new_pack.t4kmXI/_old 2009-12-10 12:58:32.000000000 +0100 +++ /var/tmp/diff_new_pack.t4kmXI/_new 2009-12-10 12:58:32.000000000 +0100 @@ -6,30 +6,47 @@ sub init_lang_data($$$$) { - my ($datap, $curLang, $long_name, $level) = @_; - + my ($datap, $lang_code, $long_name, $level) = @_; + + my $curLang; + my $locale; + # we support the syntax: package_lang_code[/ooo_source_lang_code] + if ($lang_code =~ m/([\w\-]+)\/?([\w\-]+)?/) { + $curLang = "$1"; + if (defined $2) { + $locale = "$2"; + } else { + $locale = $curLang; + $locale =~ s/-/_/g; + } + } else { + die "Syntax error: unknown format of the language code: $lang_code, line $."; + } + $datap->{$curLang}{'long_name'} = $long_name; $datap->{$curLang}{'level'} = $level; - $datap->{$curLang}{'locale'} = "$curLang"; - $datap->{$curLang}{'locale'} =~ s/-/_/g; + $datap->{$curLang}{'locale'} = $locale; $datap->{$curLang}{'package-l10n'} = (); $datap->{$curLang}{'package-help'} = (); - + return $curLang; -} +} sub read_data($$) { my ($data_file, $datap) = @_; my $curLang; - + open DATA , "< $data_file" or die "Can't open '$data_file'\n"; while( my $line = <DATA>){ chomp $line; - if ( $line =~ m/^\s*\%lang\s+([\w-]+)\s+(\w+)\s+(\d+)\s*$/ ) { + $line =~ s/#.*//; # remove comments + if ($line =~ m/^\s*\%lang\s+([\w\-\/]+)\s+(\w+)\s+(\d+)\s*$/ ) { + # long name without without quotation marks, e.g. %lang de German 1 $curLang = init_lang_data($datap, "$1", "$2", "$3"); - } elsif ( $line =~ m/^\s*\%lang\s+([\w-]+)\s+\"([\w\s]+)\"\s+(\d+)\s*$/ ) { + } elsif ( $line =~ m/^\s*\%lang\s+([\w\-\/]+)\s+\"([\w\s]+)\"\s+(\d+)\s*$/ ) { + # long name with with quotation marks, e.g. %lang br "Breton French" 2 $curLang = init_lang_data($datap, "$1", "$2", "$3"); } elsif ( $line =~ /^\s*\%poor-help\s*$/ ) { $datap->{$curLang}{'poor-help'} = 1; @@ -272,8 +289,11 @@ # 'long_name' ... string, long name of the language, e.g. "American" # 'level' ... integer, level in whih it should get build, e.g. '1' # it is the level in the rpm spec to do a reduced build -# 'locale' ... string, it is actually the lang id with undersore instead of dash, -# e.g. "en_US" +# 'locale' ... string, it is the code used by the upstream sources; +# it is usually the lang id with undersore instead of dash, +# e.g. "en_US"; ot it might differ from the package lang code if +# upstream renamed it later, for example, "gu-IN" was renamed to +# "gu" in ooo320-m5 # 'poor-help' ... integer, is defined when the help is poor and the help package # is not created # 'package-l10n' ... array of strings that should be added to the %package section for ++++++ ooo-l10n-group1 ++++++ --- /var/tmp/diff_new_pack.t4kmXI/_old 2009-12-10 12:58:32.000000000 +0100 +++ /var/tmp/diff_new_pack.t4kmXI/_new 2009-12-10 12:58:32.000000000 +0100 @@ -1,3 +1,5 @@ +# %lang lang-code[/upstream-lang-code] lang-name min-build-number + %lang cs Czech 1 %package-l10n PreReq: coreutils %package-l10n Recommends: myspell-czech ++++++ ooo-l10n-group2 ++++++ --- /var/tmp/diff_new_pack.t4kmXI/_old 2009-12-10 12:58:32.000000000 +0100 +++ /var/tmp/diff_new_pack.t4kmXI/_new 2009-12-10 12:58:32.000000000 +0100 @@ -1,3 +1,5 @@ +# %lang lang-code[/upstream-lang-code] lang-name min-build-number + %lang af African 2 %poor-help %package-l10n Recommends: myspell-african @@ -67,7 +69,7 @@ %poor-help %package-l10n Recommends: myspell-croatian -%lang gu-IN Gujarati 2 +%lang gu-IN/gu Gujarati 2 %package-l10n Requires: scalable-font-gu %package-l10n Recommends: myspell-gujarati ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org