From af96b0312b2e5bd69c0a784f35855931a089f6e0 Mon Sep 17 00:00:00 2001
From: BeatLink <beatlink+git@simplelogin.co>
Date: May 21 2021 17:12:00 +0000
Subject: [PATCH 1/12] Add Cinnamon files


---

diff --git a/cinnamon-desktop-pkgs.yaml b/cinnamon-desktop-pkgs.yaml
new file mode 100644
index 0000000..57d38db
--- /dev/null
+++ b/cinnamon-desktop-pkgs.yaml
@@ -0,0 +1,55 @@
+# DO NOT EDIT! This content is generated from comps-sync.py
+include: fedora-common-ostree.yaml
+packages:
+  - NetworkManager-config-connectivity-fedora
+  - bluedevil
+  - breeze-icon-theme
+  - dolphin
+  - firewall-config
+  - glibc-all-langpacks
+  - gnome-keyring-pam
+  - initial-setup-gui
+  - kde-gtk-config
+  - kde-print-manager
+  - kde-settings-pulseaudio
+  - kdegraphics-thumbnailers
+  - kdeplasma-addons
+  - kdialog
+  - kf5-akonadi-server
+  - kf5-akonadi-server-mysql
+  - kf5-baloo-file
+  - khelpcenter
+  - khotkeys
+  - kinfocenter
+  - kmag
+  - kmenuedit
+  - kmousetool
+  - konsole5
+  - kscreen
+  - kscreenlocker
+  - kwalletmanager5
+  - kwin
+  - pam-kwallet
+  - phonon-qt5-backend-gstreamer
+  - pinentry-qt
+  - plasma-breeze
+  - plasma-desktop
+  - plasma-desktop-doc
+  - plasma-discover
+  - plasma-discover-notifier
+  - plasma-drkonqi
+  - plasma-nm
+  - plasma-pa
+  - plasma-systemmonitor
+  - plasma-thunderbolt
+  - plasma-workspace
+  - plasma-workspace-geolocation
+  - plasma-workspace-xorg
+  - polkit-kde
+  - qt-at-spi
+  - qt5-qtbase-gui
+  - qt5-qtdeclarative
+  - sddm
+  - sddm-breeze
+  - sddm-kcm
+  - xorg-x11-drv-libinput
diff --git a/fedora-cinnamon.yaml b/fedora-cinnamon.yaml
new file mode 100644
index 0000000..028b3ed
--- /dev/null
+++ b/fedora-cinnamon.yaml
@@ -0,0 +1,15 @@
+include: cinnamon-desktop-pkgs.yaml
+ref: fedora/34/${basearch}/cinnamon
+rojig:
+  name: fedora-cinnamon
+  summary: "Fedora Cinnamon base image"
+  license: MIT
+
+packages:
+  # Portals for Flatpak
+  - xdg-desktop-portal-gtk
+
+
+repos:
+  - fedora-34
+  - fedora-34-updates

From 9080e4b1a569ffaecf4e71f532630704b423a6d4 Mon Sep 17 00:00:00 2001
From: BeatLink <beatlink+git@simplelogin.co>
Date: May 21 2021 17:15:50 +0000
Subject: [PATCH 2/12] Update Cinnamon packages


---

diff --git a/cinnamon-desktop-pkgs.yaml b/cinnamon-desktop-pkgs.yaml
index 57d38db..a41f04a 100644
--- a/cinnamon-desktop-pkgs.yaml
+++ b/cinnamon-desktop-pkgs.yaml
@@ -1,55 +1,68 @@
 # DO NOT EDIT! This content is generated from comps-sync.py
 include: fedora-common-ostree.yaml
 packages:
-  - NetworkManager-config-connectivity-fedora
-  - bluedevil
-  - breeze-icon-theme
-  - dolphin
+	- NetworkManager-adsl
+	- NetworkManager-bluetooth
+  - NetworkManager-iodine-gnome
+  - NetworkManager-l2tp-gnome
+  - NetworkManager-libreswan-gnome
+  - NetworkManager-openconnect-gnome
+  - NetworkManager-openvpn-gnome
+  - NetworkManager-ppp
+  - NetworkManager-pptp-gnome
+  - NetworkManager-vpnc-gnome
+  - NetworkManager-wifi
+  - NetworkManager-wwan
+  - abrt-desktop
+  - abrt-java-connector
+  - blueberry
+  - cinnamon
+  - cinnamon-control-center
+  - cinnamon-screensaver
+  - dnfdragora-updater
+  - eom
+  - firefox
   - firewall-config
-  - glibc-all-langpacks
-  - gnome-keyring-pam
+  - gnome-calculator
+  - gnome-disk-utility
+  - gnome-screenshot
+  - gnome-system-monitor
+  - gnome-terminal
+  - gstreamer1-plugins-ugly-free
+  - gvfs-archive
+  - gvfs-gphoto2
+  - gvfs-mtp
+  - gvfs-smb
+  - hexchat
+  - imsettings-cinnamon
   - initial-setup-gui
-  - kde-gtk-config
-  - kde-print-manager
-  - kde-settings-pulseaudio
-  - kdegraphics-thumbnailers
-  - kdeplasma-addons
-  - kdialog
-  - kf5-akonadi-server
-  - kf5-akonadi-server-mysql
-  - kf5-baloo-file
-  - khelpcenter
-  - khotkeys
-  - kinfocenter
-  - kmag
-  - kmenuedit
-  - kmousetool
-  - konsole5
-  - kscreen
-  - kscreenlocker
-  - kwalletmanager5
-  - kwin
-  - pam-kwallet
-  - phonon-qt5-backend-gstreamer
-  - pinentry-qt
-  - plasma-breeze
-  - plasma-desktop
-  - plasma-desktop-doc
-  - plasma-discover
-  - plasma-discover-notifier
-  - plasma-drkonqi
-  - plasma-nm
-  - plasma-pa
-  - plasma-systemmonitor
-  - plasma-thunderbolt
-  - plasma-workspace
-  - plasma-workspace-geolocation
-  - plasma-workspace-xorg
-  - polkit-kde
-  - qt-at-spi
-  - qt5-qtbase-gui
-  - qt5-qtdeclarative
-  - sddm
-  - sddm-breeze
-  - sddm-kcm
-  - xorg-x11-drv-libinput
+  - metacity
+  - nemo-fileroller
+  - nemo-image-converter
+  - nemo-preview
+  - nm-connection-editor
+  - paper-icon-theme
+  - pidgin
+  - pipewire-alsa
+  - pipewire-pulseaudio
+  - powerline
+  - qgnomeplatform
+  - redshift-gtk
+  - sane-backends-drivers-scanners
+  - setroubleshoot
+  - shotwell
+  - simple-scan
+  - slick-greeter
+  - slick-greeter-cinnamon
+  - system-config-printer
+  - thunderbird
+  - tmux
+  - tmux-powerline
+  - transmission
+  - vim-powerline
+  - xawtv
+  - xdg-user-dirs-gtk
+  - xed
+  - xfburn
+  - xreader
+

From 0753b6a7147b1305e5b59ced1a2691e4b4a12c70 Mon Sep 17 00:00:00 2001
From: BeatLink <beatlink+git@simplelogin.co>
Date: May 21 2021 23:56:50 +0000
Subject: [PATCH 3/12] Fix tab errors


---

diff --git a/cinnamon-desktop-pkgs.yaml b/cinnamon-desktop-pkgs.yaml
index a41f04a..ed0ef31 100644
--- a/cinnamon-desktop-pkgs.yaml
+++ b/cinnamon-desktop-pkgs.yaml
@@ -1,8 +1,8 @@
 # DO NOT EDIT! This content is generated from comps-sync.py
 include: fedora-common-ostree.yaml
 packages:
-	- NetworkManager-adsl
-	- NetworkManager-bluetooth
+  - NetworkManager-adsl
+  - NetworkManager-bluetooth
   - NetworkManager-iodine-gnome
   - NetworkManager-l2tp-gnome
   - NetworkManager-libreswan-gnome

From dcabb7a9a1b62fb04b17039fe3f38de3b002e2b0 Mon Sep 17 00:00:00 2001
From: BeatLink <beatlink+git@simplelogin.co>
Date: May 22 2021 04:59:29 +0000
Subject: [PATCH 4/12] Remove dnfdragora-updater


---

diff --git a/cinnamon-desktop-pkgs.yaml b/cinnamon-desktop-pkgs.yaml
index ed0ef31..6276554 100644
--- a/cinnamon-desktop-pkgs.yaml
+++ b/cinnamon-desktop-pkgs.yaml
@@ -19,7 +19,6 @@ packages:
   - cinnamon
   - cinnamon-control-center
   - cinnamon-screensaver
-  - dnfdragora-updater
   - eom
   - firefox
   - firewall-config

From 85f18aaf6846598e581a8ea3446c0675fac2c503 Mon Sep 17 00:00:00 2001
From: BeatLink <beatlink+git@simplelogin.co>
Date: May 22 2021 05:08:51 +0000
Subject: [PATCH 5/12] Remove any package available on flathub


---

diff --git a/cinnamon-desktop-pkgs.yaml b/cinnamon-desktop-pkgs.yaml
index 6276554..eb8bb8e 100644
--- a/cinnamon-desktop-pkgs.yaml
+++ b/cinnamon-desktop-pkgs.yaml
@@ -19,10 +19,8 @@ packages:
   - cinnamon
   - cinnamon-control-center
   - cinnamon-screensaver
-  - eom
   - firefox
   - firewall-config
-  - gnome-calculator
   - gnome-disk-utility
   - gnome-screenshot
   - gnome-system-monitor
@@ -32,7 +30,6 @@ packages:
   - gvfs-gphoto2
   - gvfs-mtp
   - gvfs-smb
-  - hexchat
   - imsettings-cinnamon
   - initial-setup-gui
   - metacity
@@ -41,7 +38,6 @@ packages:
   - nemo-preview
   - nm-connection-editor
   - paper-icon-theme
-  - pidgin
   - pipewire-alsa
   - pipewire-pulseaudio
   - powerline
@@ -49,15 +45,12 @@ packages:
   - redshift-gtk
   - sane-backends-drivers-scanners
   - setroubleshoot
-  - shotwell
   - simple-scan
   - slick-greeter
   - slick-greeter-cinnamon
   - system-config-printer
-  - thunderbird
   - tmux
   - tmux-powerline
-  - transmission
   - vim-powerline
   - xawtv
   - xdg-user-dirs-gtk

From 7d2ef2238bac27ee8d668cfbc251c8fbf968d1de Mon Sep 17 00:00:00 2001
From: BeatLink <beatlink+git@simplelogin.co>
Date: May 22 2021 05:10:35 +0000
Subject: [PATCH 6/12] Remove paper-icon-theme


---

diff --git a/cinnamon-desktop-pkgs.yaml b/cinnamon-desktop-pkgs.yaml
index eb8bb8e..8d92121 100644
--- a/cinnamon-desktop-pkgs.yaml
+++ b/cinnamon-desktop-pkgs.yaml
@@ -37,7 +37,6 @@ packages:
   - nemo-image-converter
   - nemo-preview
   - nm-connection-editor
-  - paper-icon-theme
   - pipewire-alsa
   - pipewire-pulseaudio
   - powerline

From 1bcde1947d10f2e5d25699e615404d4e7b122d90 Mon Sep 17 00:00:00 2001
From: BeatLink <beatlink+git@simplelogin.co>
Date: May 22 2021 19:34:46 +0000
Subject: [PATCH 7/12] Update comp-sync scripts


---

diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index cbfb2de..e196d69 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -267,3 +267,17 @@ desktop_exclude_list:
     - NetworkManager-wifi
     # Use Silverblue release package for now
     - fedora-release-matecompiz
+  cinnamon-desktop:
+    # Doesnt work with stree
+    - dnfdragora-updater
+    # Redundant image viewer
+    - eom
+    # Available Via Flatpak
+    - gnome-calculator
+    - hexchat
+    - pidgin
+    - shotwell
+    - thunderbird
+    - transmission
+    # Not default to cinnamon
+    - paper-icon-theme
diff --git a/comps-sync.py b/comps-sync.py
index cd9d73e..977f464 100755
--- a/comps-sync.py
+++ b/comps-sync.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python3
-# Usage: ./comps-sync.py /path/to/comps-f34.xml.in
+# Usage: ./comps-sync.py /path/to/comps-f35.xml.in
 #
 # Can both remove packages from the manifest
 # which are not mentioned in comps, and add packages from
@@ -132,7 +132,7 @@ if (n_manifest_new > 0 or n_comps_new > 0) and args.save:
 
 # Generate treefiles for all desktops
 for desktop in [ 'gnome-desktop', 'kde-desktop', 'xfce-desktop',
-        'lxqt-desktop', 'deepin-desktop', 'pantheon-desktop', 'mate-desktop']:
+        'lxqt-desktop', 'deepin-desktop', 'pantheon-desktop', 'mate-desktop', 'cinnamon-desktop']:
     print()
     print("Syncing packages for {}:".format(desktop))
 

From 0c4b1978864f06e1524cd62961b6488b2a432081 Mon Sep 17 00:00:00 2001
From: BeatLink <beatlink+git@simplelogin.co>
Date: May 22 2021 19:48:13 +0000
Subject: [PATCH 8/12] Final update to cinnamon packages


---

diff --git a/cinnamon-desktop-pkgs.yaml b/cinnamon-desktop-pkgs.yaml
index 8d92121..7ee2d79 100644
--- a/cinnamon-desktop-pkgs.yaml
+++ b/cinnamon-desktop-pkgs.yaml
@@ -19,10 +19,8 @@ packages:
   - cinnamon
   - cinnamon-control-center
   - cinnamon-screensaver
-  - firefox
   - firewall-config
   - gnome-disk-utility
-  - gnome-screenshot
   - gnome-system-monitor
   - gnome-terminal
   - gstreamer1-plugins-ugly-free
@@ -56,4 +54,3 @@ packages:
   - xed
   - xfburn
   - xreader
-
diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index e196d69..c2525b6 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -279,5 +279,7 @@ desktop_exclude_list:
     - shotwell
     - thunderbird
     - transmission
+    - firefox
+    - gnome-screenshot
     # Not default to cinnamon
     - paper-icon-theme

From f2cbb0f30ba449dfa43b7904c739371607363ab9 Mon Sep 17 00:00:00 2001
From: BeatLink <beatlink+git@simplelogin.co>
Date: May 22 2021 19:50:08 +0000
Subject: [PATCH 9/12] Add GNOME Software to manage updates and flatpak


---

diff --git a/fedora-cinnamon.yaml b/fedora-cinnamon.yaml
index 028b3ed..b560fb1 100644
--- a/fedora-cinnamon.yaml
+++ b/fedora-cinnamon.yaml
@@ -8,6 +8,8 @@ rojig:
 packages:
   # Portals for Flatpak
   - xdg-desktop-portal-gtk
+  # Include GUI to manage updates & Flatpaks
+  - gnome-software
 
 
 repos:

From 238e0d21e31bc3f5102f724e84d1768d63076878 Mon Sep 17 00:00:00 2001
From: BeatLink <beatlink+git@simplelogin.co>
Date: May 22 2021 19:51:41 +0000
Subject: [PATCH 10/12] Fix typo


---

diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index c2525b6..4685ebf 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -268,7 +268,7 @@ desktop_exclude_list:
     # Use Silverblue release package for now
     - fedora-release-matecompiz
   cinnamon-desktop:
-    # Doesnt work with stree
+    # Doesnt work with ostree
     - dnfdragora-updater
     # Redundant image viewer
     - eom

From eef2c8aaef78c3b8dbe168b600d76f61da2f15bc Mon Sep 17 00:00:00 2001
From: BeatLink <beatlink+git@simplelogin.co>
Date: May 22 2021 19:52:48 +0000
Subject: [PATCH 11/12] Correct version in script comment


---

diff --git a/comps-sync.py b/comps-sync.py
index 977f464..32cc170 100755
--- a/comps-sync.py
+++ b/comps-sync.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python3
-# Usage: ./comps-sync.py /path/to/comps-f35.xml.in
+# Usage: ./comps-sync.py /path/to/comps-f34.xml.in
 #
 # Can both remove packages from the manifest
 # which are not mentioned in comps, and add packages from

From 7621e7260d63e0cd094b166eeb0bb333c0cf0a17 Mon Sep 17 00:00:00 2001
From: BeatLink <beatlink+git@simplelogin.co>
Date: May 22 2021 22:22:39 +0000
Subject: [PATCH 12/12] Continue remove non critical packages


---

diff --git a/cinnamon-desktop-pkgs.yaml b/cinnamon-desktop-pkgs.yaml
index 7ee2d79..bebe950 100644
--- a/cinnamon-desktop-pkgs.yaml
+++ b/cinnamon-desktop-pkgs.yaml
@@ -51,6 +51,4 @@ packages:
   - vim-powerline
   - xawtv
   - xdg-user-dirs-gtk
-  - xed
   - xfburn
-  - xreader
diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index 4685ebf..f82d95f 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -281,5 +281,9 @@ desktop_exclude_list:
     - transmission
     - firefox
     - gnome-screenshot
+    - file-roller
+    - gucharmap
+    - xed
+    - xreader
     # Not default to cinnamon
     - paper-icon-theme

