From 40aa9b6853716c6e293e60cca9aa2d418a9fafc7 Mon Sep 17 00:00:00 2001
From: Troy Dawson <tdawson@redhat.com>
Date: Jan 26 2024 19:45:04 +0000
Subject: [PATCH 1/4] rhc is no longer in comps.xml


---

diff --git a/config.xml b/config.xml
index 521a9ab..f7c75da 100644
--- a/config.xml
+++ b/config.xml
@@ -26,7 +26,6 @@
 	<include from="this://./platforms/vagrant.xml"/>
 	<include from="this://./platforms/workstation.xml"/>
 	<packages type="image" patternType="plusRecommended">
-		<ignore name="rhc"/> <!-- work around broken epel comps groups -->
 		<namedCollection name="core"/>
 		<package name="btrfs-progs"/>
 		<package name="chrony"/>

From 6460b4270f718d09e7e86d82a1c7cbc652da2d02 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@centosproject.org>
Date: Jan 26 2024 19:48:20 +0000
Subject: [PATCH 2/4] components/desktop-environments: kde: Strip out kde-connect for now


KDE Connect is broken in EPEL 9 at the moment.

Reference: https://bugzilla.redhat.com/2159011

---

diff --git a/components/desktop-environments.xml b/components/desktop-environments.xml
index a801436..dcf3c2f 100644
--- a/components/desktop-environments.xml
+++ b/components/desktop-environments.xml
@@ -34,5 +34,9 @@
 		<namedCollection name="kde-apps"/>
 		<namedCollection name="kde-media"/>
 		<package name="fuse"/>
+		<ignore name="kde-connect"/> <!-- kde-connect broken in epel9 #2159011 -->
+		<ignore name="kde-connect-libs"/> <!-- kde-connect broken in epel9 #2159011 -->
+		<ignore name="kde-connect-nautilus"/> <!-- kde-connect broken in epel9 #2159011 -->
+		<ignore name="kdeconnectd"/> <!-- kde-connect broken in epel9 #2159011 -->
 	</packages>
 </image>

From 46c6b527a641d8eafba72e43f544963bf1cbaf95 Mon Sep 17 00:00:00 2001
From: Troy Dawson <tdawson@redhat.com>
Date: Jan 26 2024 19:48:39 +0000
Subject: [PATCH 3/4] Fix icon and boot problem


Signed-off-by: Troy Dawson <tdawson@redhat.com>

---

diff --git a/config.sh b/config.sh
index ac535b5..dd384ac 100755
--- a/config.sh
+++ b/config.sh
@@ -90,4 +90,26 @@ else
 	systemctl set-default multi-user.target
 fi
 
+#======================================
+# Misc fixes and tweeks
+#--------------------------------------
+
+# anaconda-live icon is not being found.
+sed -i "s/org.fedoraproject.AnacondaInstaller/anaconda/" /usr/share/applications/liveinst.desktop
+
+# We are having problems with dracut not working
+# Put in a anaconda post-script to fix it
+cat > /usr/share/anaconda/post-scripts/85-fixboot.ks << FIXBOOT_EOF
+%post
+
+echo "Fixing, and re-running dracut"
+
+/usr/bin/sed -i "s/dmsquash-live livenet //" /etc/dracut.conf.d/02-livecd.conf
+/usr/bin/dracut -v --regenerate-all --force
+
+echo "initramfs now installed"
+
+%end
+FIXBOOT_EOF
+
 exit 0

From a5c24f9c167d74e9fca97528d5752666e46a39d4 Mon Sep 17 00:00:00 2001
From: Troy Dawson <tdawson@redhat.com>
Date: Jan 26 2024 19:50:34 +0000
Subject: [PATCH 4/4] Use version 9 instead of 9.0.0


---

diff --git a/config.xml b/config.xml
index f7c75da..d59294f 100644
--- a/config.xml
+++ b/config.xml
@@ -7,7 +7,7 @@
 		<specification>CentOS Stream Hyperscale Spin</specification>
 	</description>
 	<preferences>
-		<version>9.0.0</version>
+		<version>9</version>
 		<packagemanager>dnf</packagemanager>
 		<locale>en_US</locale>
 		<keytable>us</keytable>