Accepting request 228891 from home:michal-m:branches:Base:System
- pesign-gen-repackage-spec: switch to new rpm style handling of weak dependencies OBS-URL: https://build.opensuse.org/request/show/228891 OBS-URL: https://build.opensuse.org/package/show/Base:System/pesign-obs-integration?expand=0&rev=21
This commit is contained in:
parent
f6afa13b96
commit
35447a6586
@ -122,14 +122,10 @@ my %dep2tag = (
|
||||
obsoletes => "obsolete",
|
||||
provides => "provide",
|
||||
requires => "require",
|
||||
suggests => "suggests",
|
||||
enhances => "enhances",
|
||||
);
|
||||
|
||||
# strong version of suggests and enhances
|
||||
my %dep2strong = (
|
||||
suggests => "recommends",
|
||||
enhances => "supplements",
|
||||
suggests => "suggest",
|
||||
enhances => "enhance",
|
||||
recommends => "recommend",
|
||||
supplements => "supplement",
|
||||
);
|
||||
|
||||
# specfile scriptlet => rpm tag name
|
||||
@ -310,7 +306,6 @@ my %depflags = (
|
||||
">" => (1 << 2),
|
||||
"=" => (1 << 3),
|
||||
rpmlib => (1 << 24),
|
||||
strong => (1 << 27),
|
||||
);
|
||||
|
||||
sub print_deps {
|
||||
@ -319,11 +314,7 @@ sub print_deps {
|
||||
foreach my $d (@$list) {
|
||||
next if ($d->{flags} & $depflags{rpmlib});
|
||||
|
||||
if ($d->{flags} & $depflags{strong}) {
|
||||
print SPEC $dep2strong{$depname};
|
||||
} else {
|
||||
print SPEC $depname;
|
||||
}
|
||||
print SPEC $depname;
|
||||
my @deptypes;
|
||||
while (my ($type, $bit) = each(%deptypes)) {
|
||||
push(@deptypes, $type) if $d->{flags} & $bit;
|
||||
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 3 12:01:54 CEST 2014 - ro@suse.de
|
||||
|
||||
- pesign-gen-repackage-spec: switch to new rpm style handling
|
||||
of weak dependencies
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 16 15:12:22 UTC 2014 - mmarek@suse.cz
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user