From 7cc5101bccd54470a382b1dbf8274624421e6e5b Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Sat, 24 Feb 2024 14:28:44 -0500
Subject: Rename MATE desktop snippets from MATE-Compiz to MATE

This prepares for the future change to another compositor with Wayland.
---
 components/desktops/mate-compiz.xml | 31 -------------------------------
 components/desktops/mate.xml        | 31 +++++++++++++++++++++++++++++++
 config.xml                          |  4 ++--
 teams/mate-compiz.xml               |  8 --------
 teams/mate.xml                      |  8 ++++++++
 5 files changed, 41 insertions(+), 41 deletions(-)
 delete mode 100644 components/desktops/mate-compiz.xml
 create mode 100644 components/desktops/mate.xml
 delete mode 100644 teams/mate-compiz.xml
 create mode 100644 teams/mate.xml

diff --git a/components/desktops/mate-compiz.xml b/components/desktops/mate-compiz.xml
deleted file mode 100644
index c5c9a75..0000000
--- a/components/desktops/mate-compiz.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<image>
-	<profiles>
-		<profile name="DesktopCommon" description="Common desktop packages"/>
-		<profile name="MATE_Compiz-Desktop" description="MATE_Compiz Desktop">
-			<requires profile="DesktopCommon"/>
-		</profile>
-	</profiles>
-	<packages type="image" patternType="plusRecommended" profiles="MATE_Compiz-Desktop">
-		<!-- install env-group to resolve RhBug:1891500 -->
-		<namedCollection name="mate-desktop-environment"/>
-		<namedCollection name="compiz"/>
-		<namedCollection name="libreoffice"/>
-		<package name="fedora-release-matecompiz"/>
-		<package name="earlyoom"/> <!-- replaces systemd-oomd-defaults -->
-		<ignore name="systemd-oomd-defaults"/> <!-- replaced by earlyoom, see rhbz#2068699 and rhbz#1933494 -->
-		<ignore name="audacious"/> <!-- breaks the desktop -->
-		<!-- drop things for size -->
-		<ignore name="@3d-printing"/>
-		<ignore name="@admin-tools"/>
-		<ignore name="@mate-applications"/>
-		<ignore name="brasero"/>
-		<ignore name="fedora-icon-theme"/>
-		<ignore name="gnome-icon-theme"/>
-		<ignore name="gnome-icon-theme-symbolic"/>
-		<ignore name="gnome-logs"/>
-		<ignore name="gnome-software"/>
-		<ignore name="gnome-user-docs"/>
-		<ignore name="evolution-help"/>
-		<ignore name="telnet"/> <!-- Legacy cmdline thing we don't want -->
-	</packages>
-</image>
diff --git a/components/desktops/mate.xml b/components/desktops/mate.xml
new file mode 100644
index 0000000..ec4c82d
--- /dev/null
+++ b/components/desktops/mate.xml
@@ -0,0 +1,31 @@
+<image>
+	<profiles>
+		<profile name="DesktopCommon" description="Common desktop packages"/>
+		<profile name="MATE-Desktop" description="MATE Desktop">
+			<requires profile="DesktopCommon"/>
+		</profile>
+	</profiles>
+	<packages type="image" patternType="plusRecommended" profiles="MATE-Desktop">
+		<!-- install env-group to resolve RhBug:1891500 -->
+		<namedCollection name="mate-desktop-environment"/>
+		<namedCollection name="compiz"/>
+		<namedCollection name="libreoffice"/>
+		<package name="fedora-release-matecompiz"/>
+		<package name="earlyoom"/> <!-- replaces systemd-oomd-defaults -->
+		<ignore name="systemd-oomd-defaults"/> <!-- replaced by earlyoom, see rhbz#2068699 and rhbz#1933494 -->
+		<ignore name="audacious"/> <!-- breaks the desktop -->
+		<!-- drop things for size -->
+		<ignore name="@3d-printing"/>
+		<ignore name="@admin-tools"/>
+		<ignore name="@mate-applications"/>
+		<ignore name="brasero"/>
+		<ignore name="fedora-icon-theme"/>
+		<ignore name="gnome-icon-theme"/>
+		<ignore name="gnome-icon-theme-symbolic"/>
+		<ignore name="gnome-logs"/>
+		<ignore name="gnome-software"/>
+		<ignore name="gnome-user-docs"/>
+		<ignore name="evolution-help"/>
+		<ignore name="telnet"/> <!-- Legacy cmdline thing we don't want -->
+	</packages>
+</image>
diff --git a/config.xml b/config.xml
index d34b4e8..04b15f5 100644
--- a/config.xml
+++ b/config.xml
@@ -21,7 +21,7 @@
 	<include from="this://./components/desktops/kde.xml"/>
 	<include from="this://./components/desktops/xfce.xml"/>
 	<include from="this://./components/desktops/cinnamon.xml"/>
-	<include from="this://./components/desktops/mate-compiz.xml"/>
+	<include from="this://./components/desktops/mate.xml"/>
 	<include from="this://./components/desktops/i3.xml"/>
 	<include from="this://./components/desktops/lxqt.xml"/>
 	<include from="this://./components/desktops/lxde.xml"/>
@@ -38,7 +38,7 @@
 	<include from="this://./teams/kde.xml"/>
 	<include from="this://./teams/xfce.xml"/>
 	<include from="this://./teams/cinnamon.xml"/>
-	<include from="this://./teams/mate-compiz.xml"/>
+	<include from="this://./teams/mate.xml"/>
 	<include from="this://./teams/i3.xml"/>
 	<include from="this://./teams/lxqt.xml"/>
 	<include from="this://./teams/lxde.xml"/>
diff --git a/teams/mate-compiz.xml b/teams/mate-compiz.xml
deleted file mode 100644
index d5caa6a..0000000
--- a/teams/mate-compiz.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<image>
-	<profiles>
-		<profile name="MATE_Compiz-Live" description="MATE-Compiz Spin Live DVD">
-			<requires profile="MATE_Compiz-Desktop"/>
-			<requires profile="LiveInstall"/>
-		</profile>
-	</profiles>
-</image>
diff --git a/teams/mate.xml b/teams/mate.xml
new file mode 100644
index 0000000..2f6b566
--- /dev/null
+++ b/teams/mate.xml
@@ -0,0 +1,8 @@
+<image>
+	<profiles>
+		<profile name="MATE_Compiz-Live" description="MATE-Compiz Spin Live DVD">
+			<requires profile="MATE-Desktop"/>
+			<requires profile="LiveInstall"/>
+		</profile>
+	</profiles>
+</image>
-- 
cgit v1.3.1+13