From ebf1c1900da350841f1f541502ce7be29709d048 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Aug 22 2023 16:35:43 +0000
Subject: [PATCH 1/3] comps-sync-exclude-list: Replace eog by loupe


See: https://pagure.io/fedora-workstation/issue/348
See: https://pagure.io/fedora-comps/pull-request/876

---

diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index fdae309..7f4cf39 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -117,7 +117,6 @@ desktop_exclude_list:
     # Non-critical apps -> Flatpak
     - baobab
     - cheese
-    - eog
     - evince
     - evince-djvu
     - evince-nautilus
@@ -139,6 +138,7 @@ desktop_exclude_list:
     - gnome-text-editor
     - gnome-weather
     - jwhois
+    - loupe
     - rdist
     - sane-backends-drivers-scanners
     - symlinks

From 436d098b36d19a935e3ad43ac5567ec163622aa7 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Aug 22 2023 16:35:43 +0000
Subject: [PATCH 2/3] comps-sync-exclude-list: Sort package lists


---

diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index 7f4cf39..bd6babe 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -74,25 +74,25 @@ exclude_list:
     # Will change to git-core as git pulls in Perl
     - git
     # Apps
-    - rhythmbox
     - evolution
     - evolution-ews
     - evolution-help
     - mediawriter
+    - rhythmbox
     # This is ancient now, and IMO has been superceded by cgroups
     # Also it breaks with --unified-core.
     - psacct
     # Random tools: container
-    - rdist
     - jwhois
+    - net-tools
+    - nmap-ncat
+    - rdist
     - tcpdump
     - telnet
     - traceroute
-    - net-tools
-    - nmap-ncat
     # filesystem tools, again priv container
-    - symlinks
     - dosfstools
+    - symlinks
     # Misc
     - dos2unix
     # Gnome specific
@@ -141,9 +141,9 @@ desktop_exclude_list:
     - loupe
     - rdist
     - sane-backends-drivers-scanners
-    - symlinks
     - simple-scan
     - sushi
+    - symlinks
     - tcpdump
     - telnet
     - totem

From 83ba1db98ff8527e6d176215e3c14a74b90c0f8f Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Aug 22 2023 16:36:07 +0000
Subject: [PATCH 3/3] comps-sync f39 2023-08-22


---

diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml
index d196f59..00a3128 100644
--- a/fedora-common-ostree-pkgs.yaml
+++ b/fedora-common-ostree-pkgs.yaml
@@ -6,7 +6,6 @@ packages:
   - NetworkManager-wifi
   - NetworkManager-wwan
   - acl
-  - adwaita-qt5
   - alsa-ucm
   - alsa-utils
   - amd-gpu-firmware
@@ -17,6 +16,7 @@ packages:
   - b43-openfwwf
   - basesystem
   - bash
+  - bash-color-prompt
   - bash-completion
   - bc
   - bind-utils
@@ -136,6 +136,7 @@ packages:
   - policycoreutils-python-utils
   - procps-ng
   - psmisc
+  - qadwaitadecorations-qt5
   - qemu-guest-agent
   - qt5-qtbase
   - qt5-qtbase-gui