1
0

- fix the whitespace after the preamble

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=57
This commit is contained in:
Stephan Kulow 2012-02-09 10:36:17 +00:00 committed by Git OBS Bridge
parent 9dafb4d745
commit 988ad7dcc9
2 changed files with 10 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Feb 9 10:36:01 UTC 2012 - coolo@suse.com
- fix the whitespace after the preamble
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 6 12:33:12 UTC 2012 - coolo@suse.com Mon Feb 6 12:33:12 UTC 2012 - coolo@suse.com

View File

@ -674,12 +674,14 @@ print "# needsrootforbuild\n" if $needsrootforbuild;
print "# needsbinariesforbuild\n" if $needsbinariesforbuild; print "# needsbinariesforbuild\n" if $needsbinariesforbuild;
print "# nodebuginfo\n" if $nodebuginfo; print "# nodebuginfo\n" if $nodebuginfo;
print "# icecream $icecreamforbuild\n" if $icecreamforbuild ne ''; print "# icecream $icecreamforbuild\n" if $icecreamforbuild ne '';
print "\n" if ($needsrootforbuild || $needsbinariesforbuild || $nodebuginfo || $icecreamforbuild ne ''); #print "\n" if ($needsrootforbuild || $needsbinariesforbuild || $nodebuginfo || $icecreamforbuild ne '');
while ($oldspec[0] eq "XXXBLANKLINE") { while ($oldspec[0] eq "XXXBLANKLINE" || $oldspec[0] eq "XXXDOUBLELINE") {
shift @oldspec; shift @oldspec;
} }
print "\n\n";
my $license_unique = !grep { $_ ne $main_license } values %seen_licenses; my $license_unique = !grep { $_ ne $main_license } values %seen_licenses;
my $groups_unique = !grep { $_ ne $main_group } values %seen_groups; my $groups_unique = !grep { $_ ne $main_group } values %seen_groups;
# we need to have unique groups in the spec file as long as we support SLE11 ;( # we need to have unique groups in the spec file as long as we support SLE11 ;(
@ -689,6 +691,7 @@ my $first_summary = 1;
my $line; my $line;
while (@oldspec) { while (@oldspec) {
$line = shift @oldspec; $line = shift @oldspec;
if ($line eq "XXXBLANKLINE") { if ($line eq "XXXBLANKLINE") {
print "\n" unless $oldspec[0] && ($oldspec[0] =~ m/^XXX.*LINE/ || $oldspec[0] =~ /^\s*$/ || $oldspec[0] =~ /^\n/); print "\n" unless $oldspec[0] && ($oldspec[0] =~ m/^XXX.*LINE/ || $oldspec[0] =~ /^\s*$/ || $oldspec[0] =~ /^\n/);
} elsif ($line eq "XXXDOUBLELINE") { } elsif ($line eq "XXXDOUBLELINE") {