diff options
| -rwxr-xr-x | rpmdrake | 18 | ||||
| -rw-r--r-- | rpmdrake.spec | 7 |
2 files changed, 17 insertions, 8 deletions
@@ -485,12 +485,15 @@ or you already installed all of them.")); my $tag_fix = { 'font' => 'monospace' }; my @files = ([ N("Files:\n"), $tag_tag ], [ $pkgs->{$key}{files} || N("(Not available)"), $tag_fix ]); my @chglo = ([ N("Changelog:\n"), $tag_tag ], @{$pkgs->{$key}{changelog} || [[ N("(Not available)") ]]}); - my @max_info = if_(@$max_info_in_descr, - $MODE eq 'remove' ? () - : ([ N("Source: "), $tag_tag ], [ pkg2medium($pkgs->{$key}{pkg}, $urpm)->{name} ], [ "\n" ], - [ N("Currently installed version: "), $tag_tag ], - [ find_installed_version($pkgs->{$key}{pkg}) ], [ "\n" ]), - $options{'changelog-first'} ? (@chglo, [ "\n" ], @files) : (@files, [ "\n\n" ], @chglo)); + my (@max1, @max2); + if (@$max_info_in_descr) { + @max1 = + $MODE eq 'remove' ? () + : ([ N("Source: "), $tag_tag ], [ pkg2medium($pkgs->{$key}{pkg}, $urpm)->{name} ], [ "\n" ], + [ N("Currently installed version: "), $tag_tag ], + [ find_installed_version($pkgs->{$key}{pkg}) ], [ "\n" ]); + @max2 = $options{'changelog-first'} ? (@chglo, [ "\n" ], @files) : (@files, [ "\n\n" ], @chglo); + } $MODE eq 'update' and gtktext_insert($info_update, [ [ N("Reason for update: "), $tag_tag ], [ beautify_description($descriptions->{$name}{pre}) ] ]); @@ -499,9 +502,10 @@ or you already installed all of them.")); [ N("Size: "), $tag_tag ], [ N("%s KB", int($pkgs->{$key}{pkg}->size/1024))."\n" ], if_($MODE eq 'update', [ N("Importance: "), $tag_tag ], [ "$descriptions->{$name}{importance}\n" ]), + @max1, [ "\n".N("Summary: "), $tag_tag ], [ "$pkgs->{$key}{summary}\n\n" ], [ N("Description: "), $tag_tag ], [ "$pkgs->{$key}{description}\n" ], - @max_info ]; + @max2 ]; }, check_interactive_to_toggle => sub { 1 }, grep_allowed_to_toggle => sub { @_ }, diff --git a/rpmdrake.spec b/rpmdrake.spec index 9419f801..a248f3a5 100644 --- a/rpmdrake.spec +++ b/rpmdrake.spec @@ -8,7 +8,7 @@ %define name rpmdrake %define version 2.1 -%define release 14mdk +%define release 15mdk Name: %{name} Version: %{version} @@ -116,6 +116,11 @@ rm -rf $RPM_BUILD_ROOT %{perl_vendorarch}/*.pm %changelog +* Fri Apr 4 2003 Guillaume Cottenceau <gc@mandrakesoft.com> 2.1-15mdk +- rpmdrake: small UI change to follow #3610, e.g. in + "maximum information" mode, have the source and currently installed + version closer to the top + * Wed Mar 26 2003 Guillaume Cottenceau <gc@mandrakesoft.com> 2.1-14mdk - grpmi/curl_download: fixes for MandrakeClub: - don't verify peer's certificate (-k option of commandline curl) |