Hello community, here is the log from the commit of package obs-service-format_spec_file for openSUSE:Factory checked in at Mon Jul 4 12:31:37 CEST 2011. -------- --- obs-service-format_spec_file/obs-service-format_spec_file.changes 2011-07-04 00:17:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/obs-service-format_spec_file/obs-service-format_spec_file.changes 2011-07-04 11:43:18.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 4 11:42:26 CEST 2011 - ro@suse.de + +- fix empty line handling (multiple subsequent empty lines) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ obs-service-format_spec_file.spec ++++++ --- /var/tmp/diff_new_pack.2gtE6n/_old 2011-07-04 12:31:19.000000000 +0200 +++ /var/tmp/diff_new_pack.2gtE6n/_new 2011-07-04 12:31:19.000000000 +0200 @@ -22,7 +22,7 @@ Group: Development/Tools/Building Summary: An OBS source service: reformats a spec file to SUSE standard. Version: 0.1 -Release: 5 +Release: 7 Source: format_spec_file Source1: format_spec_file.service Source2: prepare_spec ++++++ prepare_spec ++++++ --- /var/tmp/diff_new_pack.2gtE6n/_old 2011-07-04 12:31:19.000000000 +0200 +++ /var/tmp/diff_new_pack.2gtE6n/_new 2011-07-04 12:31:19.000000000 +0200 @@ -95,7 +95,7 @@ sub maybe_add_empty_line() { - push @oldspec, "" + push @oldspec, "XXXBLANKLINE" if ($current_section ne "description" && $oldspec[-1] !~ /^\s*$/); } @@ -284,6 +284,7 @@ $args[1] =~ s/^\!//; $if_not = 1; } + $args[2] = "" unless $args[2]; if ( ($args[1] eq "0") || ($args[1] eq "%name" && $args[2] eq "!=" && $args[3] eq $base_package) || ($args[1] eq "%name" && $args[2] eq "==" && $args[3] ne $base_package) @@ -382,7 +383,7 @@ warn "changed to $current_section for $_\n" if $debug; } - push @oldspec, $_; + push @oldspec, "$_"; # multiline macros need an extra newline with old RPMs if (/^%(\w[\w\d]+).*[^\\]$/) { push @oldspec, "" if (defined($multiline_macros{$1})); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org