From dd281881007bdb31ab6bef459c4aa2e1ce692c9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <tim@siosm.fr>
Date: Mon, 15 Apr 2019 23:51:45 +0200
Subject: [PATCH] comps-blacklist: keep one browser and file manager

Keep at least one browser, file manager and terminal application in the
base image:
  * those applications are almost always needed,
  * we can not pre-install Flatpak replacement yet,
  * we must ensure they work well.
---
 comps-sync-blacklist.yml | 10 ----------
 gnome-desktop-pkgs.yaml  |  2 ++
 kde-desktop-pkgs.yaml    |  1 +
 lxqt-desktop-pkgs.yaml   |  3 +++
 xfce-desktop-pkgs.yaml   |  4 ++++
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/comps-sync-blacklist.yml b/comps-sync-blacklist.yml
index c886fa3..568d051 100644
--- a/comps-sync-blacklist.yml
+++ b/comps-sync-blacklist.yml
@@ -135,8 +135,6 @@ desktop_blacklist:
     - gnome-screenshot
     - gnome-weather
     - jwhois
-    - nautilus
-    - nautilus-sendto
     - orca
     - rdist
     - sane-backends-drivers-scanners
@@ -157,7 +155,6 @@ desktop_blacklist:
     # Non-critical apps -> Flatpak
     - akregator
     - cagibi
-    - dolphin
     - gnome-keyring-pam
     - gwenview
     - kaddressbook
@@ -208,11 +205,7 @@ desktop_blacklist:
     - abrt-desktop
     - dnfdragora-updater
     # Non-critical apps -> Flatpak
-    - Thunar
     - fros-recordmydesktop
-    - thunar-archive-plugin
-    - thunar-media-tags-plugin
-    - thunar-volman
     - tumbler
     # Misc
     - alsa-utils
@@ -226,9 +219,6 @@ desktop_blacklist:
     - dnfdragora-updater
     # Non-critical apps -> Flatpak
     - ark
-    - falkon
-    - falkon-kwallet
-    - pcmanfm-qt
   deepin-desktop:
     # Incompatible with ostree for various reasons
     - dnfdragora-updater
diff --git a/gnome-desktop-pkgs.yaml b/gnome-desktop-pkgs.yaml
index 1d76c57..b197068 100644
--- a/gnome-desktop-pkgs.yaml
+++ b/gnome-desktop-pkgs.yaml
@@ -53,6 +53,8 @@ packages:
   - libsane-hpaio
   - mesa-libEGL
   - mousetweaks
+  - nautilus
+  - nautilus-sendto
   - polkit
   - rygel
   - tracker
diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml
index d5b6db2..07b9445 100644
--- a/kde-desktop-pkgs.yaml
+++ b/kde-desktop-pkgs.yaml
@@ -4,6 +4,7 @@ packages:
   - NetworkManager-config-connectivity-fedora
   - bluedevil
   - breeze-icon-theme
+  - dolphin
   - glibc-all-langpacks
   - initial-setup-gui
   - kde-gtk-config
diff --git a/lxqt-desktop-pkgs.yaml b/lxqt-desktop-pkgs.yaml
index f415132..f044dd4 100644
--- a/lxqt-desktop-pkgs.yaml
+++ b/lxqt-desktop-pkgs.yaml
@@ -4,6 +4,8 @@ packages:
   - breeze-cursor-theme
   - breeze-gtk
   - breeze-icon-theme
+  - falkon
+  - falkon-kwallet
   - fedora-icon-theme
   - firewall-config
   - initial-setup-gui
@@ -25,6 +27,7 @@ packages:
   - notification-daemon
   - obconf
   - openbox
+  - pcmanfm-qt
   - perl-File-MimeInfo
   - qterminal
   - sddm
diff --git a/xfce-desktop-pkgs.yaml b/xfce-desktop-pkgs.yaml
index d212b6c..21891b8 100644
--- a/xfce-desktop-pkgs.yaml
+++ b/xfce-desktop-pkgs.yaml
@@ -12,6 +12,7 @@ packages:
   - NetworkManager-sstp-gnome
   - NetworkManager-strongswan-gnome
   - NetworkManager-vpnc-gnome
+  - Thunar
   - adwaita-gtk2-theme
   - adwaita-icon-theme
   - albatross-gtk2-theme
@@ -37,6 +38,9 @@ packages:
   - lightdm-gtk
   - network-manager-applet
   - nm-connection-editor
+  - thunar-archive-plugin
+  - thunar-media-tags-plugin
+  - thunar-volman
   - xdg-user-dirs-gtk
   - xfce4-about
   - xfce4-appfinder