pool/pesign-obs-integration
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 228891 from home:michal-m:branches:Base:System

Browse Source 
- 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:
Marcus Meissner 2014-04-03 15:11:38 +00:00 committed by Git OBS Bridge
parent f6afa13b96
commit 35447a6586
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pesign-gen-repackage-spec
View File

@ -122,14 +122,10 @@ my %dep2tag = (
obsoletes => "obsolete", obsoletes => "obsolete",
provides => "provide", provides => "provide",
requires => "require", requires => "require",
suggests => "suggests", suggests => "suggest",
enhances => "enhances", enhances => "enhance",
); recommends => "recommend",
supplements => "supplement",
# strong version of suggests and enhances
my %dep2strong = (
suggests => "recommends",
enhances => "supplements",
); );
# specfile scriptlet => rpm tag name # specfile scriptlet => rpm tag name
@ -310,7 +306,6 @@ my %depflags = (
">" => (1 << 2), ">" => (1 << 2),
"=" => (1 << 3), "=" => (1 << 3),
rpmlib => (1 << 24), rpmlib => (1 << 24),
strong => (1 << 27),
); );
sub print_deps { sub print_deps {
@ -319,11 +314,7 @@ sub print_deps {
foreach my $d (@$list) { foreach my $d (@$list) {
next if ($d->{flags} & $depflags{rpmlib}); next if ($d->{flags} & $depflags{rpmlib});
if ($d->{flags} & $depflags{strong}) { print SPEC $depname;
print SPEC $dep2strong{$depname};
} else {
print SPEC $depname;
}
my @deptypes; my @deptypes;
while (my ($type, $bit) = each(%deptypes)) { while (my ($type, $bit) = each(%deptypes)) {
push(@deptypes, $type) if $d->{flags} & $bit; push(@deptypes, $type) if $d->{flags} & $bit;

6
pesign-obs-integration.changes
View File

@ -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 Thu Jan 16 15:12:22 UTC 2014 - mmarek@suse.cz