[oe-commits] Richard Purdie : package_rpm: Ensure PV manipulations are correct

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 0f8447a7d99d2645b932eac1c24149f0c2d3791e
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=0f8447a7d99d2645b932eac1c24149f0c2d3791e

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Sat Mar 16 15:46:15 2013 +0000

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 <richard.purdie at linuxfoundation.org>

---

 meta/classes/package_rpm.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 8aa868d..b6d76e7 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