From def655f62d2eb8f28f7855a6cfe1a7036d540633 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Nov 25 2020 11:21:51 +0000
Subject: [PATCH 1/3] Deepin: Add GNOME Software


---

diff --git a/fedora-deepin.yaml b/fedora-deepin.yaml
index c972e73..a6470e4 100644
--- a/fedora-deepin.yaml
+++ b/fedora-deepin.yaml
@@ -5,6 +5,8 @@ rojig:
   summary: "Fedora Deepin base image"
   license: MIT
 packages:
+  # GUI to manage updates & Flatpaks
+  - gnome-software
 
 repos:
   - fedora-rawhide

From 7eb5b517658bfeacb8ccebbbdce273ffda644e9d Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Nov 25 2020 11:21:51 +0000
Subject: [PATCH 2/3] Add Mate desktop variant


---

diff --git a/comps-sync-blacklist.yml b/comps-sync-blacklist.yml
index 06f211e..970f864 100644
--- a/comps-sync-blacklist.yml
+++ b/comps-sync-blacklist.yml
@@ -230,3 +230,36 @@ desktop_blacklist:
   deepin-desktop:
     # Incompatible with ostree for various reasons
     - dnfdragora-updater
+  mate-desktop:
+    # Incompatible with ostree for various reasons
+    - abrt-desktop
+    - abrt-java-connector
+    - dnfdragora-updater
+    # Non-critical apps -> Flatpak
+    - blivet-gui
+    - filezilla
+    - gnome-disk-utility
+    - gnome-logs
+    - gnote
+    - gparted
+    - hexchat
+    - p7zip
+    - p7zip-plugins
+    - simple-scan
+    - thunderbird
+    - transmission-gtk
+    - vim-enhanced
+    - xfburn
+    - yelp
+    # Non critical NetworkManager plugins
+    - NetworkManager-bluetooth
+    - NetworkManager-iodine-gnome
+    - NetworkManager-l2tp-gnome
+    - NetworkManager-libreswan-gnome
+    - NetworkManager-ovs
+    - NetworkManager-sstp-gnome
+    - NetworkManager-strongswan-gnome
+    - NetworkManager-team
+    - NetworkManager-wifi
+    # Use Silverblue release package for now
+    - fedora-release-matecompiz
diff --git a/comps-sync.py b/comps-sync.py
index c580baa..0a4715d 100755
--- a/comps-sync.py
+++ b/comps-sync.py
@@ -131,7 +131,8 @@ if (n_manifest_new > 0 or n_comps_new > 0) and args.save:
     write_manifest(base_pkgs_path, manifest_packages)
 
 # Generate treefiles for all desktops
-for desktop in [ 'gnome-desktop', 'kde-desktop', 'xfce-desktop', 'lxqt-desktop', 'deepin-desktop', 'pantheon-desktop']:
+for desktop in [ 'gnome-desktop', 'kde-desktop', 'xfce-desktop',
+        'lxqt-desktop', 'deepin-desktop', 'pantheon-desktop', 'mate-desktop']:
     print()
     print("Syncing packages for {}:".format(desktop))
 
diff --git a/fedora-mate.yaml b/fedora-mate.yaml
new file mode 100644
index 0000000..6080915
--- /dev/null
+++ b/fedora-mate.yaml
@@ -0,0 +1,16 @@
+include: mate-desktop-pkgs.yaml
+ref: fedora/rawhide/${basearch}/mate
+rojig:
+  name: fedora-mate
+  summary: "Fedora Mate base image"
+  license: MIT
+
+packages:
+  # Portals for Flatpak
+  - xdg-desktop-portal-gtk
+
+exclude-packages:
+  - python3-unbound
+
+repos:
+  - fedora-rawhide
diff --git a/mate-desktop-pkgs.yaml b/mate-desktop-pkgs.yaml
new file mode 100644
index 0000000..5dd9ed9
--- /dev/null
+++ b/mate-desktop-pkgs.yaml
@@ -0,0 +1,95 @@
+# DO NOT EDIT! This content is generated from comps-sync.py
+include: fedora-common-ostree.yaml
+packages:
+  - NetworkManager-adsl
+  - NetworkManager-openconnect-gnome
+  - NetworkManager-openvpn-gnome
+  - NetworkManager-ppp
+  - NetworkManager-pptp-gnome
+  - NetworkManager-ssh-gnome
+  - NetworkManager-vpnc-gnome
+  - NetworkManager-wwan
+  - alsa-plugins-pulseaudio
+  - atril
+  - atril-caja
+  - atril-thumbnailer
+  - blueberry
+  - caja
+  - caja-actions
+  - caja-image-converter
+  - caja-open-terminal
+  - caja-sendto
+  - caja-wallpaper
+  - caja-xattr-tags
+  - dconf-editor
+  - engrampa
+  - eom
+  - f33-backgrounds-base
+  - f33-backgrounds-extras-base
+  - f33-backgrounds-extras-mate
+  - f33-backgrounds-mate
+  - firefox
+  - firewall-config
+  - gnome-epub-thumbnailer
+  - gnome-themes-extra
+  - gstreamer1-plugins-ugly-free
+  - gtk2-engines
+  - gucharmap
+  - gvfs-afc
+  - gvfs-afp
+  - gvfs-archive
+  - gvfs-fuse
+  - gvfs-gphoto2
+  - gvfs-mtp
+  - gvfs-nfs
+  - gvfs-smb
+  - initial-setup-gui
+  - libmatekbd
+  - libmatemixer
+  - libmateweather
+  - libsecret
+  - lightdm
+  - lm_sensors
+  - marco
+  - mate-applets
+  - mate-backgrounds
+  - mate-calc
+  - mate-control-center
+  - mate-desktop
+  - mate-dictionary
+  - mate-disk-usage-analyzer
+  - mate-icon-theme
+  - mate-media
+  - mate-menus
+  - mate-menus-preferences-category-menu
+  - mate-notification-daemon
+  - mate-panel
+  - mate-polkit
+  - mate-power-manager
+  - mate-screensaver
+  - mate-screenshot
+  - mate-search-tool
+  - mate-session-manager
+  - mate-settings-daemon
+  - mate-system-log
+  - mate-system-monitor
+  - mate-terminal
+  - mate-themes
+  - mate-user-admin
+  - mate-user-guide
+  - mozo
+  - network-manager-applet
+  - nm-connection-editor
+  - orca
+  - parole
+  - pavucontrol
+  - pluma
+  - seahorse
+  - seahorse-caja
+  - setroubleshoot
+  - slick-greeter-mate
+  - system-config-language
+  - system-config-printer
+  - system-config-printer-applet
+  - usermode-gtk
+  - xdg-user-dirs-gtk

From 3add1c1124b75cb0fb5896fbb4444f1f6ae120d0 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Nov 25 2020 11:21:51 +0000
Subject: [PATCH 3/3] Add 'base' variant with no default desktop environment


This is a small desktop oriented installation for minimal desktop
environments such as Sway, etc. that can easily be overlayed on top.

Signed-off-by: Timothée Ravier <tim@siosm.fr>

---

diff --git a/fedora-base.yaml b/fedora-base.yaml
new file mode 100644
index 0000000..ed3c178
--- /dev/null
+++ b/fedora-base.yaml
@@ -0,0 +1,15 @@
+include: fedora-common-ostree.yaml
+ref: fedora/rawhide/${basearch}/base
+rojig:
+  name: fedora-base
+  summary: "Fedora base image for alternative DE"
+  license: MIT
+packages:
+  # XWayland support
+  - xorg-x11-server-Xwayland
+  # Portals for Flatpak
+  - xdg-desktop-portal
+  - xdg-desktop-portal-gtk
+
+repos:
+  - fedora-rawhide

