From fa9cfc4ece2ed3b87840b268191d1012f96a3792 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Sun, 16 Apr 2023 11:18:49 -0400
Subject: [PATCH] Remove the Cinnamon desktop profile

At this time, we do not intend to support the Cinnamon desktop due
to its reliance on X11 and the lack of interest by the upstream
Fedora Cinnamon SIG for ARM for their spin.

This mostly reverts commit a3c3a8137f597d4a41152b4d7eb83187fa37345e.
---
 README.md                           | 1 -
 components/desktop-environments.xml | 7 -------
 config.sh                           | 2 +-
 platforms/workstation.xml           | 4 ----
 4 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 320f714..e6ac9be 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,6 @@ This repository has multiple branches, one for each supported Fedora release. Th
 
 * Minimal (image type: `oem`, image profiles: `Minimal`)
 * Server (image type: `oem`, image profiles: `Server`)
-* Workstation Cinnamon (image type: `oem`, image profiles: `Workstation-Cinnamon`)
 * Workstation GNOME (image type: `oem`, image profiles: `Workstation-GNOME`)
 * Workstation KDE (image type: `oem`, image profiles: `Workstation-KDE`)
 
diff --git a/components/desktop-environments.xml b/components/desktop-environments.xml
index 9c3a23e..10ba178 100644
--- a/components/desktop-environments.xml
+++ b/components/desktop-environments.xml
@@ -3,9 +3,6 @@
 		<profile name="DesktopCommon" description="Common desktop packages">
 			<requires profile="Common"/>
 		</profile>
-		<profile name="Cinnamon-Desktop" description="Cinnamon Desktop">
-			<requires profile="DesktopCommon"/>
-		</profile>
 		<profile name="GNOME-Desktop" description="GNOME Desktop">
 			<requires profile="DesktopCommon"/>
 		</profile>
@@ -27,10 +24,6 @@
 		<ignore name="@dial-up"/>
 		<ignore name="@guest-desktop-agents"/>
 	</packages>
-	<packages type="image" patternType="plusRecommended" profiles="Cinnamon-Desktop">
-		<namedCollection name="cinnamon-desktop-environment"/>
-		<package name="fedora-release-cinnamon"/>
-	</packages>
 	<packages type="image" patternType="plusRecommended" profiles="GNOME-Desktop">
 		<namedCollection name="workstation-product-environment"/>
 		<package name="fedora-release-workstation"/>
diff --git a/config.sh b/config.sh
index f636d62..47142bb 100755
--- a/config.sh
+++ b/config.sh
@@ -75,7 +75,7 @@ touch /etc/reconfigSys
 #======================================
 # Setup default target
 #--------------------------------------
-if [[ "$kiwi_profiles" == *"Cinnamon"* ]] || [[ "$kiwi_profiles" == *"GNOME"* ]] || [[ "$kiwi_profiles" == *"KDE"* ]]; then
+if [[ "$kiwi_profiles" == *"GNOME"* ]] || [[ "$kiwi_profiles" == *"KDE"* ]]; then
 	systemctl set-default graphical.target
 else
 	systemctl set-default multi-user.target
diff --git a/platforms/workstation.xml b/platforms/workstation.xml
index 02226fa..697eddf 100644
--- a/platforms/workstation.xml
+++ b/platforms/workstation.xml
@@ -4,10 +4,6 @@
 			<requires profile="BootCore"/>
 			<requires profile="DesktopCommon"/>
 		</profile>
-		<profile name="Workstation-Cinnamon" description="Workstation with Cinnamon Desktop">
-			<requires profile="WorkstationCommon"/>
-			<requires profile="Cinnamon-Desktop"/>
-		</profile>
 		<profile name="Workstation-GNOME" description="Workstation with GNOME Desktop">
 			<requires profile="WorkstationCommon"/>
 			<requires profile="GNOME-Desktop"/>