rpm: consume target package iterator

Generate supplemental package sections directly from the shared target package sequence.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>

Author: cpuguy83

packaging/linux/rpm/template.go

@@ -915,8 +915,7 @@ func (w *specWrapper) Install() fmt.Stringer {
 	artifacts := w.Spec.GetArtifacts(w.Target)
 	installArtifacts(b, artifacts, w.Name)
 
-	packages := w.Spec.GetSubPackages(w.Target)
-	for key, pkg := range dalec.SortedMapIter(packages) {
+	for key, pkg := range dalec.GetSubPackagesForTarget(w.Spec, w.Target) {
 		if pkg.Artifacts != nil {
 			resolvedName := pkg.ResolvedName(w.Spec.Name, key)
 			installArtifacts(b, *pkg.Artifacts, resolvedName)
@@ -1201,8 +1200,7 @@ func (s *subPkgWrapper) directive() string {
 func (w *specWrapper) SubPackages() (fmt.Stringer, error) {
 	b := &strings.Builder{}
 
-	packages := w.Spec.GetSubPackages(w.Target)
-	for key, pkg := range dalec.SortedMapIter(packages) {
+	for key, pkg := range dalec.GetSubPackagesForTarget(w.Spec, w.Target) {
 		sw := &subPkgWrapper{
 			ResolvedName: pkg.ResolvedName(w.Spec.Name, key),
 			Pkg:          pkg,