diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/package_rpm.bbclass | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 12b4bfa536..3a2997637b 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
@@ -605,7 +605,14 @@ python write_specfile () { | |||
605 | pv = subd['PV'] | 605 | pv = subd['PV'] |
606 | pkgv = subd['PKGV'] | 606 | pkgv = subd['PKGV'] |
607 | reppv = pkgv.replace('-', '+') | 607 | reppv = pkgv.replace('-', '+') |
608 | verlist.append(ver.replace(pv, reppv).replace(pkgv, reppv)) | 608 | ver = ver.replace(pv, reppv).replace(pkgv, reppv) |
609 | if 'PKGR' in subd: | ||
610 | # Make sure PKGR rather than PR in ver | ||
611 | pr = '-' + subd['PR'] | ||
612 | pkgr = '-' + subd['PKGR'] | ||
613 | if pkgr not in ver: | ||
614 | ver = ver.replace(pr, pkgr) | ||
615 | verlist.append(ver) | ||
609 | else: | 616 | else: |
610 | verlist.append(ver) | 617 | verlist.append(ver) |
611 | newdeps_dict[dep] = verlist | 618 | newdeps_dict[dep] = verlist |