pool/obs-service-format_spec_file
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 244638 from openSUSE:Tools

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

- update prepare_spec from git to fix (bnc#891152)

OBS-URL: https://build.opensuse.org/request/show/244638
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/obs-service-format_spec_file?expand=0&rev=60
This commit is contained in:
Ludwig Nussel 2014-08-15 07:58:27 +00:00 committed by Git OBS Bridge
commit e3eaf1d01d
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
obs-service-format_spec_file.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
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
- update prepare_spec from git to fix (bnc#891152)
-------------------------------------------------------------------
Thu Jul 31 15:44:36 CEST 2014 - ro@suse.de

4
prepare_spec
View File

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