diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2003-12-30 11:05:04 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2003-12-30 11:05:04 +0000 |
| commit | 76a10aae169d3eff63a6979477c56381af9dc053 (patch) | |
| tree | a58f3a633935adc4021b80afb789c2179bc8b01a | |
| parent | 2730e2991e9f76f3ce6fa43093863fa2cbb8ac18 (diff) | |
| download | rpmdrake-76a10aae169d3eff63a6979477c56381af9dc053.tar rpmdrake-76a10aae169d3eff63a6979477c56381af9dc053.tar.gz rpmdrake-76a10aae169d3eff63a6979477c56381af9dc053.tar.bz2 rpmdrake-76a10aae169d3eff63a6979477c56381af9dc053.tar.xz rpmdrake-76a10aae169d3eff63a6979477c56381af9dc053.zip | |
fix filelist wrongly displayed in RTL language, thx titi, #6581
| -rwxr-xr-x | rpmdrake | 10 | ||||
| -rw-r--r-- | rpmdrake.spec | 1 |
2 files changed, 7 insertions, 4 deletions
@@ -239,7 +239,7 @@ sub extract_header { if ($MODE eq 'remove') { @$max_info_in_descr or return; my $name = my_fullname($pkg->{pkg}); - add2hash($pkg, { files => chomp_(scalar(`rpm -ql $name`)) || N("(none)"), + add2hash($pkg, { files => [ split /\n/, chomp_(scalar(`rpm -ql $name`)) || N("(none)") ], changelog => $chg_prepro->(scalar(`LC_ALL=C rpm -q --changelog $name`)) }); } else { my ($p, $medium) = ($pkg->{pkg}, pkg2medium($pkg->{pkg}, $urpm)); @@ -256,7 +256,7 @@ sub extract_header { add2hash($pkg, { summary => rpm_summary($p->summary), description => rpm_description($p->description) }); my $localtime2changelog = sub { scalar(localtime($_[0])) =~ /(.*) \S+ (\d{4})$/ && "$1 $2" }; @$max_info_in_descr and add2hash($pkg, { - files => join("\n", $p->files) || N("(none)"), + files => scalar($p->files) ? [ $p->files ] : [ N("(none)") ], changelog => $chg_prepro->(join("\n", mapn { "* ".$localtime2changelog->($_[2])." $_[0]\n\n$_[1]\n" } [ $p->changelog_name ], [ $p->changelog_text ], [ $p->changelog_time ])) }); $p->pack_header; @@ -602,7 +602,9 @@ or you already installed all of them.")); or slow_func($tree->window, sub { extract_header($pkgs->{$key}, $urpm) }); my $tag_tag = { 'foreground' => 'royalblue3', 'weight' => Gtk2::Pango->PANGO_WEIGHT_BOLD }; my $tag_fix = { 'font' => 'monospace' }; - my @files = ([ N("Files:\n"), $tag_tag ], [ $pkgs->{$key}{files} || N("(Not available)"), $tag_fix ]); + my @files = ([ N("Files:\n"), $tag_tag ], exists $pkgs->{$key}{files} + ? map { [ "\x{200e}$_\n", $tag_fix ] } @{$pkgs->{$key}{files}} + : [ N("(Not available)") ]); my @chglo = ([ N("Changelog:\n"), $tag_tag ], @{$pkgs->{$key}{changelog} || [[ N("(Not available)") ]]}); my @source_info = ($MODE eq 'remove' || !@$max_info_in_descr ? () : ([ N("Medium: "), $tag_tag ], @@ -610,7 +612,7 @@ or you already installed all of them.")); [ N("Currently installed version: "), $tag_tag ], [ find_installed_version($pkgs->{$key}{pkg}) ], [ "\n" ])); my @max_info = if_(@$max_info_in_descr, $options{'changelog-first'} ? (@chglo, [ "\n" ], @files) - : (@files, [ "\n\n" ], @chglo)); + : (@files, [ "\n" ], @chglo)); [ [ N("Name: "), $tag_tag ], [ "$name\n" ], [ N("Version: "), $tag_tag ], [ "$version\n" ], [ N("Size: "), $tag_tag ], [ N("%s KB", int($pkgs->{$key}{pkg}->size/1024))."\n" ], diff --git a/rpmdrake.spec b/rpmdrake.spec index b1f0bdb0..38a500f7 100644 --- a/rpmdrake.spec +++ b/rpmdrake.spec @@ -103,6 +103,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Tue Dec 23 2003 Guillaume Cottenceau <gc@mandrakesoft.com> 2.1-36mdk - provide drak* names as well +- fix filelist wrongly displayed in RTL language, thx titi, #6581 * Fri Sep 5 2003 Guillaume Cottenceau <gc@mandrakesoft.com> 2.1-35mdk - fix invalid-build-requires libcurl2-devel |