1
0

- do not enter empty license line if not found (eg in include file)

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=143
This commit is contained in:
Ruediger Oertel 2014-08-14 00:28:18 +00:00 committed by Git OBS Bridge
parent 02eaff4f09
commit 53670ee8e6
2 changed files with 6 additions and 1 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Aug 14 02:28:08 CEST 2014 - ro@suse.de
- do not enter empty license line if not found (eg in include file)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Aug 13 11:21:40 CEST 2014 - ro@suse.de Wed Aug 13 11:21:40 CEST 2014 - ro@suse.de

View File

@ -715,7 +715,7 @@ while (@oldspec) {
} elsif ($line =~ m/XXXPOSTSUMMARY (.*)$/) { } elsif ($line =~ m/XXXPOSTSUMMARY (.*)$/) {
my $current_package = $1; my $current_package = $1;
my $license = $seen_licenses{$current_package} || $main_license; my $license = $seen_licenses{$current_package} || $main_license;
printf("%-16s%s\n", "License:", $license) if (!$license_unique || $first_summary || $current_package eq $base_package); printf("%-16s%s\n", "License:", $license) if $license && (!$license_unique || $first_summary || $current_package eq $base_package);
my $group = $seen_groups{$current_package} || $main_group; my $group = $seen_groups{$current_package} || $main_group;
printf("%-16s%s\n", "Group:", $group) if (!$groups_unique || $first_summary || $current_package eq $base_package); printf("%-16s%s\n", "Group:", $group) if (!$groups_unique || $first_summary || $current_package eq $base_package);
$first_summary = 0; $first_summary = 0;