summaryrefslogtreecommitdiffstats
path: root/meta/classes/package_rpm.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/package_rpm.bbclass')
-rw-r--r--meta/classes/package_rpm.bbclass14
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 1d8c686330..3df66cc16a 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -330,7 +330,7 @@ python write_specfile () {
330 if dep and ver: 330 if dep and ver:
331 if '-' in ver: 331 if '-' in ver:
332 subd = oe.packagedata.read_subpkgdata_dict(dep, d) 332 subd = oe.packagedata.read_subpkgdata_dict(dep, d)
333 pv = subd['PV'] 333 pv = subd['PKGV']
334 reppv = pv.replace('-', '+') 334 reppv = pv.replace('-', '+')
335 ver = ver.replace(pv, reppv) 335 ver = ver.replace(pv, reppv)
336 newdeps_dict[dep] = ver 336 newdeps_dict[dep] = ver
@@ -383,9 +383,9 @@ python write_specfile () {
383 # Construct the SPEC file... 383 # Construct the SPEC file...
384 srcname = bb.data.getVar('PN', d, True) 384 srcname = bb.data.getVar('PN', d, True)
385 srcsummary = (bb.data.getVar('SUMMARY', d, True) or bb.data.getVar('DESCRIPTION', d, True) or ".") 385 srcsummary = (bb.data.getVar('SUMMARY', d, True) or bb.data.getVar('DESCRIPTION', d, True) or ".")
386 srcversion = bb.data.getVar('PV', d, True).replace('-', '+') 386 srcversion = bb.data.getVar('PKGV', d, True).replace('-', '+')
387 srcrelease = bb.data.getVar('PR', d, True) 387 srcrelease = bb.data.getVar('PKGR', d, True)
388 srcepoch = (bb.data.getVar('PE', d, True) or "") 388 srcepoch = (bb.data.getVar('PKGE', d, True) or "")
389 srclicense = bb.data.getVar('LICENSE', d, True) 389 srclicense = bb.data.getVar('LICENSE', d, True)
390 srcsection = bb.data.getVar('SECTION', d, True) 390 srcsection = bb.data.getVar('SECTION', d, True)
391 srcmaintainer = bb.data.getVar('MAINTAINER', d, True) 391 srcmaintainer = bb.data.getVar('MAINTAINER', d, True)
@@ -438,9 +438,9 @@ python write_specfile () {
438 splitname = pkgname 438 splitname = pkgname
439 439
440 splitsummary = (bb.data.getVar('SUMMARY', localdata, True) or bb.data.getVar('DESCRIPTION', localdata, True) or ".") 440 splitsummary = (bb.data.getVar('SUMMARY', localdata, True) or bb.data.getVar('DESCRIPTION', localdata, True) or ".")
441 splitversion = (bb.data.getVar('PV', localdata, True) or "").replace('-', '+') 441 splitversion = (bb.data.getVar('PKGV', localdata, True) or "").replace('-', '+')
442 splitrelease = (bb.data.getVar('PR', localdata, True) or "") 442 splitrelease = (bb.data.getVar('PKGR', localdata, True) or "")
443 splitepoch = (bb.data.getVar('PE', localdata, True) or "") 443 splitepoch = (bb.data.getVar('PKGE', localdata, True) or "")
444 splitlicense = (bb.data.getVar('LICENSE', localdata, True) or "") 444 splitlicense = (bb.data.getVar('LICENSE', localdata, True) or "")
445 splitsection = (bb.data.getVar('SECTION', localdata, True) or "") 445 splitsection = (bb.data.getVar('SECTION', localdata, True) or "")
446 splitdescription = (bb.data.getVar('DESCRIPTION', localdata, True) or ".") 446 splitdescription = (bb.data.getVar('DESCRIPTION', localdata, True) or ".")