From: Richard Purdie Date: Sat, 16 Mar 2013 15:46:15 +0000 (+0000) Subject: package_rpm: Ensure PV manipulations are correct X-Git-Tag: 2015-4~7233 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=0f8447a7d99d2645b932eac1c24149f0c2d3791e;p=openembedded-core.git package_rpm: Ensure PV manipulations are correct The previous change to this function fixed one manipuation at the expense of the other, depending on ow expanded the versioned dependency string was when the AUTOINC substitution was made. This update ensures we cover both cases and ensures the classextended version works as as well as the normal case. Signed-off-by: Richard Purdie --- diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 8aa868d3a2..b6d76e7a3b 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -610,7 +610,7 @@ python write_specfile () { pv = subd['PV'] pkgv = subd['PKGV'] reppv = pkgv.replace('-', '+') - verlist.append(ver.replace(pv, reppv)) + verlist.append(ver.replace(pv, reppv).replace(pkgv, reppv)) else: verlist.append(ver) newdeps_dict[dep] = verlist