From e7a917d3227a68f16b0c78c36339ad0d147b2dcd Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sat, 23 Oct 2021 10:35:22 +0200 Subject: Further prevent SRPM to conflicts with its own build deps commit 3fac0be4adab0ee63b6473d613982b418cc7ab92 was not enough in iurt case. We must also ignore SRPM provides. Rationale: Since rpm-4.16+, rpmlib adds NEVR provides for all packages that would be built into source rpm. Thus we hit: "installed package gdb-minimal-10.2-2.mga9.x86_64 is conflicting with gdb-11.1-1.mga9.src" Because of "Conflicts: gdb-headless[> 10.2-2.mga9]" Because gdb-11.1-1.mga9.src.rpm provides "gdb-headless = 11.1-1.mga9" --- Changes | 2 ++ URPM/Resolve.pm | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Changes b/Changes index 39f07ee..8dd6395 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,5 @@ +- Further prevent SRPM to conflicts with its own build deps with rpm-4.16+ + Version 5.124 - 19 October 2021 - Prevent SRPM to conflicts with its own build deps diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index 24c283b..dded564 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -1268,7 +1268,7 @@ sub resolve_requested__no_recommends_ { _handle_conflict($urpm, $state, $pkg, $p, $property, $property, \@properties, \%diff_provides_h, $options{keep} && \@keep); } } - }); + }) if $pkg->arch ne 'src'; # rpm-4.16+ add provides for all subpkgs to srpm which we don't care about for conflicts #- keep existing package and therefore cancel current one. if (@keep) { -- cgit v1.2.1