pool/obs-service-format_spec_file
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 106046 from openSUSE:Tools

Browse Source 
- fix sorting of tag lines that are not on the beginning of the file

- not only break buildrequires per (sorted) line, but also
  Requires and Provides

OBS-URL: https://build.opensuse.org/request/show/106046
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/obs-service-format_spec_file?expand=0&rev=24
This commit is contained in:
Stephan Kulow 2012-02-20 15:15:38 +00:00 committed by Git OBS Bridge
commit ba8cfd5ad2
2 changed files with 44 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
obs-service-format_spec_file.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon Feb 20 13:19:09 UTC 2012 - coolo@suse.com
- fix sorting of tag lines that are not on the beginning of the file
-------------------------------------------------------------------
Mon Feb 20 08:15:52 UTC 2012 - coolo@suse.com
- not only break buildrequires per (sorted) line, but also
Requires and Provides
-------------------------------------------------------------------
Tue Feb 14 11:05:24 UTC 2012 - coolo@suse.com

53
prepare_spec
View File

@ -230,7 +230,7 @@ sub set_current_pkg {
return ($curpack, $curlang);
}
sub sort_buildrequires_helper {
sub sort_tags_helper {
if (($a =~ /^[^#]*\(/) != ($b =~ /^[^#]*\(/)) {
if ($a =~ /^[^#]*\(/) {
1;
@ -317,18 +317,23 @@ sub read_and_parse_old_spec {
$_ =~ s/%{?epoch}?[:-]//g;
$_ =~ s/ 0:/ /g if ( /^requires/i || /^buildreq/i );
if ( /^BuildRequires:/ ) {
my $cur_buildreq = $_;
$cur_buildreq =~ s/^BuildRequires:\s*//;
if ( /^BuildRequires:/i || /^Requires:/i || /^Provides:/i ) {
my $cur_tag = $_;
my $tag = '';
if (m/^(\S+):\s*(.*)$/) {
$tag = $1;
$cur_tag = $2;
}
my %aa;
while ($cur_buildreq =~ m{([^,\s]+(\s*[<=>]+\s*[^,\s]+)?)}g) {
while ($cur_tag =~ m{([^,\s]+(\s*[<=>]+\s*[^,\s]+)?)}g) {
$aa{$1}=1;
}
# ignore line if it looks like a "usedforbuild" line, i.e.
# if it contains too many base packages
next if (grep {$aa{$_}} qw{gcc rpm glibc bash}) > 2;
for my $br (sort keys(%aa)) {
push @oldspec, "BuildRequires: $br";
for my $value (sort keys(%aa)) {
push (@oldspec, sprintf("%-16s%s", capitalize_case($tag) . ":", $value));
}
next;
}
@ -617,30 +622,38 @@ if ( ! stat ((glob("$specdir/$base_package*.spec"))[0] || "") ) {
read_and_parse_old_spec ( $specfile, $base_package );
my $linesmoved = 1;
while ($linesmoved) {
for my $tag (qw(BuildRequires Requires Provides)) {
my $linesmoved = 1;
sortcycle: while ($linesmoved) {
$linesmoved = 0;
my @firstlines = ();
my @buildrequires = ();
my @tags = ();
while ($oldspec[0]) {
my $l = shift @oldspec;
if ($l =~ m/^BuildRequires:/ ) {
push(@buildrequires, $l);
if ($l =~ m/^$tag:/ ) {
push(@tags, $l);
} else {
# if there are already buildrequires, we need to sort and exit
if (@buildrequires > 0) {
my @sortedbrs = sort sort_buildrequires_helper @buildrequires;
$linesmoved = !compare_arrays(\@buildrequires, \@sortedbrs);
@oldspec = (@firstlines, @sortedbrs, $l, @oldspec);
@firstlines = ();
@buildrequires = ();
last;
# if there are already tags, we need to sort and exit
if (@tags > 0) {
my @sortedtags = sort sort_tags_helper @tags;
$linesmoved = !compare_arrays(\@tags, \@sortedtags);
if ($linesmoved) {
@oldspec = (@firstlines, @sortedtags, $l, @oldspec);
@firstlines = ();
@tags = ();
next sortcycle;
} else {
@firstlines = (@firstlines, @tags, $l);
@tags = ();
next;
}
} else {
push(@firstlines, $l);
}
}
}
@oldspec = (@firstlines, @oldspec);
}
}