From b5c9feeff9849cef11d267cfdb4b2656f082b45d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Budai?= <ondrej@budai.cz>
Date: Tue, 27 Jun 2023 13:33:35 +0200
Subject: [PATCH] distro/fedora: remove obsolete conditions for package set
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

osbuild-composer no longer supports Fedora 36, so we are safe to drop these
now.

iotCommitPackageSet would really benefit from sorting, but that would
create hard to handle conflicts with other PRs upstream, so I decided
not to do it in this commit.

Signed-off-by: Ondřej Budai <ondrej@budai.cz>
---
 internal/distro/fedora/package_sets.go | 32 +++-----------------------
 1 file changed, 3 insertions(+), 29 deletions(-)

diff --git a/internal/distro/fedora/package_sets.go b/internal/distro/fedora/package_sets.go
index 00a1b5f9e..ae267a6df 100644
--- a/internal/distro/fedora/package_sets.go
+++ b/internal/distro/fedora/package_sets.go
@@ -172,23 +172,10 @@ func iotCommitPackageSet(t *imageType) rpmmd.PackageSet {
 			"dbus-parsec",
 			"iwl7260-firmware",
 			"iwlax2xx-firmware",
+			"greenboot-default-health-checks",
 		},
 	}
 
-	if common.VersionLessThan(t.arch.distro.osVersion, "36") {
-		ps = ps.Append(rpmmd.PackageSet{
-			Include: []string{
-				"greenboot-grub2",
-				"greenboot-reboot",
-				"greenboot-rpm-ostree-grub2",
-				"greenboot-status",
-			},
-		},
-		)
-	} else {
-		ps = ps.Append(rpmmd.PackageSet{Include: []string{"greenboot-default-health-checks"}})
-	}
-
 	return ps
 
 }
@@ -338,6 +325,7 @@ func anacondaPackageSet(t *imageType) rpmmd.PackageSet {
 			"plymouth",
 			"python3-pyatspi",
 			"rdma-core",
+			"rit-meera-new-fonts",
 			"rng-tools",
 			"rpcbind",
 			"rpm-ostree",
@@ -347,6 +335,7 @@ func anacondaPackageSet(t *imageType) rpmmd.PackageSet {
 			"sg3_utils",
 			"sil-abyssinica-fonts",
 			"sil-padauk-fonts",
+			"sil-scheherazade-new-fonts",
 			"smartmontools",
 			"spice-vdagent",
 			"strace",
@@ -380,21 +369,6 @@ func anacondaPackageSet(t *imageType) rpmmd.PackageSet {
 			},
 		})
 	}
-	if common.VersionLessThan(t.arch.distro.osVersion, "37") {
-		ps = ps.Append(rpmmd.PackageSet{
-			Include: []string{
-				"smc-meera-fonts",
-				"sil-scheherazade-fonts",
-			},
-		})
-	} else {
-		ps = ps.Append(rpmmd.PackageSet{
-			Include: []string{
-				"rit-meera-new-fonts",
-				"sil-scheherazade-new-fonts",
-			},
-		})
-	}
 
 	switch t.Arch().Name() {
 	case platform.ARCH_X86_64.String():