Accepting request 243190 from openSUSE:Tools

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

OBS-URL: https://build.opensuse.org/request/show/243190
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/obs-service-format_spec_file?expand=0&rev=59
This commit is contained in:
Stephan Kulow 2014-08-01 12:34:14 +00:00 committed by Git OBS Bridge
commit b6bc8c5e3f
2 changed files with 8 additions and 3 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Jul 31 15:44:36 CEST 2014 - ro@suse.de
- update prepare_spec from git to fix (bnc#889537)
-------------------------------------------------------------------
Thu Jul 10 10:49:45 UTC 2014 - coolo@suse.com

View File

@ -267,7 +267,7 @@ sub read_and_parse_old_spec {
next;
}
if ( /^# vim:/ ) {
if ( /^# vim:/ && $current_section eq "header" ) {
$vim_modeline = $_;
next;
}
@ -320,7 +320,7 @@ sub read_and_parse_old_spec {
}
my %aa;
if ($cur_tag =~ /%\(/) {
if ($cur_tag =~ /%\(/ || $cur_tag =~ /%\{/) {
# do not touch lines with shell execution
$aa{$cur_tag}=1;
} else {
@ -724,6 +724,6 @@ while (@oldspec) {
}
}
print "\n" unless $line eq "XXXBLANKLINE";
print "\n" unless $line eq "XXXBLANKLINE" || $line eq "";
print "%changelog\n";