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.bbclass26
1 files changed, 0 insertions, 26 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 07ab5cdd9e..084546f733 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -433,19 +433,6 @@ python write_specfile () {
433 print_deps(splitrsuggests, "Suggests", spec_preamble_bottom, d) 433 print_deps(splitrsuggests, "Suggests", spec_preamble_bottom, d)
434 print_deps(splitrprovides, "Provides", spec_preamble_bottom, d) 434 print_deps(splitrprovides, "Provides", spec_preamble_bottom, d)
435 print_deps(splitrobsoletes, "Obsoletes", spec_preamble_bottom, d) 435 print_deps(splitrobsoletes, "Obsoletes", spec_preamble_bottom, d)
436
437 # conflicts can not be in a provide! We will need to filter it.
438 if splitrconflicts:
439 depends_dict = bb.utils.explode_dep_versions2(splitrconflicts)
440 newdeps_dict = {}
441 for dep in depends_dict:
442 if dep not in splitrprovides:
443 newdeps_dict[dep] = depends_dict[dep]
444 if newdeps_dict:
445 splitrconflicts = bb.utils.join_deps(newdeps_dict)
446 else:
447 splitrconflicts = ""
448
449 print_deps(splitrconflicts, "Conflicts", spec_preamble_bottom, d) 436 print_deps(splitrconflicts, "Conflicts", spec_preamble_bottom, d)
450 437
451 spec_preamble_bottom.append('') 438 spec_preamble_bottom.append('')
@@ -541,19 +528,6 @@ python write_specfile () {
541 print_deps(srcrsuggests, "Suggests", spec_preamble_top, d) 528 print_deps(srcrsuggests, "Suggests", spec_preamble_top, d)
542 print_deps(srcrprovides + (" /bin/sh" if srcname.startswith("nativesdk-") else ""), "Provides", spec_preamble_top, d) 529 print_deps(srcrprovides + (" /bin/sh" if srcname.startswith("nativesdk-") else ""), "Provides", spec_preamble_top, d)
543 print_deps(srcrobsoletes, "Obsoletes", spec_preamble_top, d) 530 print_deps(srcrobsoletes, "Obsoletes", spec_preamble_top, d)
544
545 # conflicts can not be in a provide! We will need to filter it.
546 if srcrconflicts:
547 depends_dict = bb.utils.explode_dep_versions2(srcrconflicts)
548 newdeps_dict = {}
549 for dep in depends_dict:
550 if dep not in srcrprovides:
551 newdeps_dict[dep] = depends_dict[dep]
552 if newdeps_dict:
553 srcrconflicts = bb.utils.join_deps(newdeps_dict)
554 else:
555 srcrconflicts = ""
556
557 print_deps(srcrconflicts, "Conflicts", spec_preamble_top, d) 531 print_deps(srcrconflicts, "Conflicts", spec_preamble_top, d)
558 532
559 spec_preamble_top.append('') 533 spec_preamble_top.append('')