mirror of
https://abf.rosa.ru/djam/rpm.git
synced 2025-02-23 18:33:04 +00:00
17 lines
750 B
Diff
17 lines
750 B
Diff
|
--- rpm-5.4.4/build/reqprov.c.range_nooverlap~ 2012-02-15 18:58:39.075973279 +0100
|
||
|
|
+++ rpm-5.4.4/build/reqprov.c 2012-02-15 19:02:01.120218409 +0100
|
||
|
|
@@ -122,7 +122,12 @@ int addReqProv(/*@unused@*/ Spec spec, H
|
||
|
|
rpmds old = rpmdsSingle(flagtag, names[len], versions[len] ? versions[len] : "", flags[len]);
|
||
|
|
rpmds new = rpmdsSingle(flagtag, N, EVR, Flags);
|
||
|
|
|
||
|
|
- overlap = rpmdsCompare(new, old);
|
||
|
|
+ /* do not consider dependency ranges like R: foo > 1, R: foo < 3
|
||
|
|
+ * as overlapping (mdvbz#65269)
|
||
|
|
+ */
|
||
|
|
+ if (!((Flags & RPMSENSE_GREATER && flags[len] & RPMSENSE_LESS) ||
|
||
|
|
+ (Flags & RPMSENSE_LESS && flags[len] & RPMSENSE_GREATER)))
|
||
|
|
+ overlap = rpmdsCompare(new, old);
|
||
|
|
|
||
|
|
if (overlap) {
|
||
|
|
EVR_t lEVR = rpmEVRnew(RPMSENSE_ANY, 0),
|