aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Changes2
-rw-r--r--URPM/Resolve.pm2
2 files changed, 3 insertions, 1 deletions
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) {