rpm/obs-service-format_spec_file
SHA256
1
0
Fork 0
forked from pool/obs-service-format_spec_file
Code Pull Requests Activity

- preserve release tag if it's more than a number

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=30
This commit is contained in:
Stephan Kulow 2011-12-12 10:29:11 +00:00 committed by Git OBS Bridge
parent 996a0af0af
commit 6385ac95fb
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
obs-service-format_spec_file.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Dec 12 10:28:57 UTC 2011 - coolo@suse.com
- preserve release tag if it's more than a number
-------------------------------------------------------------------
Wed Dec 7 14:04:46 UTC 2011 - coolo@suse.com

9
prepare_spec
View File

@ -24,7 +24,6 @@ my $vim_modeline;
my $nosrc_result = 0;
my $current_section = "header";
my $had_debug_package = 0;
my %pkg_version = ();
my $main_license;
my %seen_licenses = ();
my $main_group;
@ -490,6 +489,10 @@ sub read_and_parse_old_spec {
}
# reset Release
if ( /^Release\s*:\s*(.*)/i ) {
if ($1 !~ m/^[0-9]*$/ && $oldspec[-1] eq "XXXRELEASE") {
pop @oldspec;
push @oldspec, sprintf("%-16s%s","Release:", $1);
}
# will be after Version
next;
}
@ -535,7 +538,7 @@ sub read_and_parse_old_spec {
$version{$c_pack} = $_;
$version{$c_pack} =~ s/^Version:\s*(.*)\s*/$1/;
push @oldspec, sprintf("%-16s%s","Version:",$version{$c_pack});
push @oldspec, sprintf("%-16s%s","Release:", "0");
push @oldspec, "XXXRELEASE";
next;
}
}
@ -688,6 +691,8 @@ while (@oldspec) {
print "\n" unless $oldspec[0] && ($oldspec[0] =~ m/^XXX.*LINE/ || $oldspec[0] =~ /^\s*$/ || $oldspec[0] =~ /^\n/);
} elsif ($line eq "XXXDOUBLELINE") {
print "\n\n" unless $oldspec[0] && ($oldspec[0] =~ m/^XXX.*LINE/ || $oldspec[0] =~ /^\s*$/ || $oldspec[0] =~ /^\n/);
} elsif ($line eq "XXXRELEASE") {
printf("%-16s%s\n", "Release:", "0") ;
} elsif ($line =~ m/XXXPOSTSUMMARY (.*)$/) {
my $current_package = $1;
my $license = $seen_licenses{$current_package} || $main_license;