From 04656f8f0bbddf9715ff96cf4e5feb8dc64cdb83 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Jun 11 2020 15:36:12 +0000
Subject: [PATCH 1/8] fedora-32-updates.repo: minor whitespace fix


---

diff --git a/fedora-32-updates.repo b/fedora-32-updates.repo
index 99fb8a7..27f8d53 100644
--- a/fedora-32-updates.repo
+++ b/fedora-32-updates.repo
@@ -3,4 +3,4 @@ name=Fedora 32 $basearch Updates
 mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f32&arch=$basearch
 enabled=0
 gpgcheck=1
-metadata_expire=1d 
+metadata_expire=1d

From 82fa3343c33d9f168b18a0fb998d8be67d9a9077 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Jun 11 2020 15:36:17 +0000
Subject: [PATCH 2/8] Enable fedora-32-updates repo


---

diff --git a/fedora-deepin.yaml b/fedora-deepin.yaml
index b588d59..ceb3e8e 100644
--- a/fedora-deepin.yaml
+++ b/fedora-deepin.yaml
@@ -8,3 +8,4 @@ packages:
 
 repos:
   - fedora-32
+  - fedora-32-updates
diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml
index f48fb4e..43a99fc 100644
--- a/fedora-kinoite.yaml
+++ b/fedora-kinoite.yaml
@@ -15,3 +15,4 @@ packages:
 
 repos:
   - fedora-32
+  - fedora-32-updates
diff --git a/fedora-lxqt.yaml b/fedora-lxqt.yaml
index 0db46bc..a8cc798 100644
--- a/fedora-lxqt.yaml
+++ b/fedora-lxqt.yaml
@@ -11,3 +11,4 @@ packages:
 
 repos:
   - fedora-32
+  - fedora-32-updates
diff --git a/fedora-pantheon.yaml b/fedora-pantheon.yaml
index 5d9c540..e9b387f 100644
--- a/fedora-pantheon.yaml
+++ b/fedora-pantheon.yaml
@@ -8,3 +8,4 @@ packages:
 
 repos:
   - fedora-32
+  - fedora-32-updates
diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml
index 32442e7..08bc042 100644
--- a/fedora-silverblue.yaml
+++ b/fedora-silverblue.yaml
@@ -14,3 +14,4 @@ packages:
 
 repos:
   - fedora-32
+  - fedora-32-updates
diff --git a/fedora-xfce.yaml b/fedora-xfce.yaml
index 7a3398c..254d4e9 100644
--- a/fedora-xfce.yaml
+++ b/fedora-xfce.yaml
@@ -7,5 +7,7 @@ rojig:
 packages:
   # Portals for Flatpak
   - xdg-desktop-portal-gtk
+
 repos:
   - fedora-32
+  - fedora-32-updates

From 9fb56aada83e903f18ee5e7358d70f3765db799a Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Jun 11 2020 15:36:19 +0000
Subject: [PATCH 3/8] blacklist: remove rodent-icon-theme


Removed in Fedora 29.

---

diff --git a/comps-sync-blacklist.yml b/comps-sync-blacklist.yml
index 8e3b9a8..7552627 100644
--- a/comps-sync-blacklist.yml
+++ b/comps-sync-blacklist.yml
@@ -227,8 +227,6 @@ desktop_blacklist:
     - firewall-config
     - openssh-askpass
     - vim-enhanced
-    # ?
-    - rodent-icon-theme
   lxqt-desktop:
     # Incompatible with ostree for various reasons
     - dnfdragora-updater

From 225f0379b65f25da4ac83a579fb4c71520de5def Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Jun 11 2020 15:36:24 +0000
Subject: [PATCH 4/8] Re-add gnome-keyring-pam for KDE variant


This is required for keyring unlock for users sessions.

---

diff --git a/comps-sync-blacklist.yml b/comps-sync-blacklist.yml
index 7552627..1e12440 100644
--- a/comps-sync-blacklist.yml
+++ b/comps-sync-blacklist.yml
@@ -170,7 +170,6 @@ desktop_blacklist:
     # Non-critical apps -> Flatpak
     - akregator
     - cagibi
-    - gnome-keyring-pam
     - gwenview
     - kaddressbook
     - kamera
diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml
index 07b9445..21d273e 100644
--- a/kde-desktop-pkgs.yaml
+++ b/kde-desktop-pkgs.yaml
@@ -6,6 +6,7 @@ packages:
   - breeze-icon-theme
   - dolphin
   - glibc-all-langpacks
+  - gnome-keyring-pam
   - initial-setup-gui
   - kde-gtk-config
   - kde-print-manager

From 1951846deb5cea21d852551945b0ae5bd9815dc8 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Jun 11 2020 15:36:29 +0000
Subject: [PATCH 5/8] kde & lxqt: keep an archive manager in the base image


Keep Arck (an archive manager) in the base image until we can install
flatpaks by default in variants.

---

diff --git a/comps-sync-blacklist.yml b/comps-sync-blacklist.yml
index 1e12440..2e3cd97 100644
--- a/comps-sync-blacklist.yml
+++ b/comps-sync-blacklist.yml
@@ -229,8 +229,6 @@ desktop_blacklist:
   lxqt-desktop:
     # Incompatible with ostree for various reasons
     - dnfdragora-updater
-    # Non-critical apps -> Flatpak
-    - ark
   deepin-desktop:
     # Incompatible with ostree for various reasons
     - dnfdragora-updater
diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml
index 43a99fc..ce12331 100644
--- a/fedora-kinoite.yaml
+++ b/fedora-kinoite.yaml
@@ -12,6 +12,8 @@ packages:
   - xorg-x11-server-Xwayland
   # Portals for Flatpak
   - xdg-desktop-portal-kde
+  # Provide an archive manager by default
+  - ark
 
 repos:
   - fedora-32
diff --git a/lxqt-desktop-pkgs.yaml b/lxqt-desktop-pkgs.yaml
index f044dd4..c6de606 100644
--- a/lxqt-desktop-pkgs.yaml
+++ b/lxqt-desktop-pkgs.yaml
@@ -1,6 +1,7 @@
 # DO NOT EDIT! This content is generated from comps-sync.py
 include: fedora-common-ostree.yaml
 packages:
+  - ark
   - breeze-cursor-theme
   - breeze-gtk
   - breeze-icon-theme

From 1326e5e0e7f661b90d7a7df5db2faf93a5abab2c Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Jun 11 2020 15:36:47 +0000
Subject: [PATCH 6/8] Exclude python3-unbound


This package creates the unbound user and group which are not used by
any system daemon. Excluding it thus simplifies /etc/passwd & /etc/group
management.

This package is a recommended dependency pulled by python3-dnf which is
itself pulled by initial-setup-gui.

This impacts all the desktop environments that replaced
gnome-initial-setup with initial-setup-gui (KDE, XFCE & LXQt as of this
commit).

---

diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml
index ce12331..0dd2045 100644
--- a/fedora-kinoite.yaml
+++ b/fedora-kinoite.yaml
@@ -15,6 +15,9 @@ packages:
   # Provide an archive manager by default
   - ark
 
+exclude-packages:
+  - python3-unbound
+
 repos:
   - fedora-32
   - fedora-32-updates
diff --git a/fedora-lxqt.yaml b/fedora-lxqt.yaml
index a8cc798..af642ee 100644
--- a/fedora-lxqt.yaml
+++ b/fedora-lxqt.yaml
@@ -9,6 +9,9 @@ packages:
   # Portals for Flatpak
   - xdg-desktop-portal-kde
 
+exclude-packages:
+  - python3-unbound
+
 repos:
   - fedora-32
   - fedora-32-updates
diff --git a/fedora-xfce.yaml b/fedora-xfce.yaml
index 254d4e9..eba5cd8 100644
--- a/fedora-xfce.yaml
+++ b/fedora-xfce.yaml
@@ -8,6 +8,9 @@ packages:
   # Portals for Flatpak
   - xdg-desktop-portal-gtk
 
+exclude-packages:
+  - python3-unbound
+
 repos:
   - fedora-32
   - fedora-32-updates

From 21ed74dbe21f17850f464d399aaacfe23425064f Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Jun 11 2020 15:37:37 +0000
Subject: [PATCH 7/8] comps-sync f32 2020-06-11


---

diff --git a/pantheon-desktop-pkgs.yaml b/pantheon-desktop-pkgs.yaml
index 78d1ee3..3f8fe10 100644
--- a/pantheon-desktop-pkgs.yaml
+++ b/pantheon-desktop-pkgs.yaml
@@ -1,7 +1,6 @@
 # DO NOT EDIT! This content is generated from comps-sync.py
 include: fedora-common-ostree.yaml
 packages:
-  - cerbere
   - contractor
   - elementary-calculator
   - elementary-calendar

From 144f8fb686322ec02e719300ed2330f4d5b1372b Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Jun 11 2020 15:37:40 +0000
Subject: [PATCH 8/8] XFCE: Blacklist uncommon NetworkManager plugins


---

diff --git a/comps-sync-blacklist.yml b/comps-sync-blacklist.yml
index 2e3cd97..dc02aaa 100644
--- a/comps-sync-blacklist.yml
+++ b/comps-sync-blacklist.yml
@@ -226,6 +226,13 @@ desktop_blacklist:
     - firewall-config
     - openssh-askpass
     - vim-enhanced
+    # Remove uncommon NetworkManager plugins
+    - NetworkManager-fortisslvpn-gnome
+    - NetworkManager-iodine-gnome
+    - NetworkManager-l2tp-gnome
+    - NetworkManager-libreswan-gnome
+    - NetworkManager-sstp-gnome
+    - NetworkManager-strongswan-gnome
   lxqt-desktop:
     # Incompatible with ostree for various reasons
     - dnfdragora-updater
diff --git a/xfce-desktop-pkgs.yaml b/xfce-desktop-pkgs.yaml
index ac08987..81fd6d2 100644
--- a/xfce-desktop-pkgs.yaml
+++ b/xfce-desktop-pkgs.yaml
@@ -1,16 +1,10 @@
 # DO NOT EDIT! This content is generated from comps-sync.py
 include: fedora-common-ostree.yaml
 packages:
-  - NetworkManager-fortisslvpn-gnome
-  - NetworkManager-iodine-gnome
-  - NetworkManager-l2tp-gnome
-  - NetworkManager-libreswan-gnome
   - NetworkManager-openconnect-gnome
   - NetworkManager-openvpn-gnome
   - NetworkManager-pptp-gnome
   - NetworkManager-ssh-gnome
-  - NetworkManager-sstp-gnome
-  - NetworkManager-strongswan-gnome
   - NetworkManager-vpnc-gnome
   - Thunar
   - adwaita-gtk2-theme

