From 53670ee8e665dbb1c6dc9a5a0ff7510a5fbfd4ebb99f69c62d12e2a740aa78db Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Thu, 14 Aug 2014 00:28:18 +0000 Subject: [PATCH] - 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 --- obs-service-format_spec_file.changes | 5 +++++ prepare_spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 36d97e9..d61026e 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -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 diff --git a/prepare_spec b/prepare_spec index 65a07c3..3fcb997 100644 --- a/prepare_spec +++ b/prepare_spec @@ -715,7 +715,7 @@ 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 || $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; printf("%-16s%s\n", "Group:", $group) if (!$groups_unique || $first_summary || $current_package eq $base_package); $first_summary = 0;