From 2e86d085a6e6502fd58fe2f602c19ca2d686396e Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Tue, 8 Feb 2022 10:13:16 -0800
Subject: [PATCH] comps-sync f36 2022-02-08

Font changes related to
https://fedoraproject.org/wiki/Changes/DefaultToNotoFonts , and
gedit replaced with gnome-text-editor (so changed the exclusion
list).

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 comps-sync-exclude-list.yml    |  2 +-
 fedora-common-ostree-pkgs.yaml | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index 92636ab..f2e053b 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -141,7 +141,6 @@ desktop_exclude_list:
     - evince-nautilus
     - file-roller
     - file-roller-nautilus
-    - gedit
     - gnome-boxes
     - gnome-calculator
     - gnome-calendar
@@ -155,6 +154,7 @@ desktop_exclude_list:
     - gnome-maps
     - gnome-photos
     - gnome-screenshot
+    - gnome-text-editor
     - gnome-weather
     - jwhois
     - rdist
diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml
index 83186bc..e339121 100644
--- a/fedora-common-ostree-pkgs.yaml
+++ b/fedora-common-ostree-pkgs.yaml
@@ -5,7 +5,7 @@ packages:
   - NetworkManager-config-connectivity-fedora
   - NetworkManager-wifi
   - NetworkManager-wwan
-  - abattis-cantarell-fonts
+  - abattis-cantarell-vf-fonts
   - acl
   - adwaita-qt5
   - alsa-sof-firmware
@@ -60,9 +60,22 @@ packages:
   - glx-utils
   - gnupg2
   - google-noto-emoji-color-fonts
+  - google-noto-sans-arabic-vf-fonts
+  - google-noto-sans-armenian-vf-fonts
+  - google-noto-sans-canadian-aboriginal-vf-fonts
+  - google-noto-sans-cherokee-vf-fonts
   - google-noto-sans-cjk-ttc-fonts
+  - google-noto-sans-ethiopic-vf-fonts
+  - google-noto-sans-georgian-vf-fonts
   - google-noto-sans-gurmukhi-vf-fonts
+  - google-noto-sans-hebrew-vf-fonts
+  - google-noto-sans-lao-vf-fonts
+  - google-noto-sans-math-vf-fonts
+  - google-noto-sans-mono-vf-fonts
   - google-noto-sans-sinhala-vf-fonts
+  - google-noto-sans-thaana-vf-fonts
+  - google-noto-sans-vf-fonts
+  - google-noto-serif-vf-fonts
   - gstreamer1-plugins-bad-free
   - gstreamer1-plugins-good
   - gstreamer1-plugins-ugly-free
@@ -164,6 +177,7 @@ packages:
   - qt5-qtxmlpatterns
   - quota
   - realmd
+  - rit-meera-new-fonts
   - rootfiles
   - rpm
   - rsync
@@ -171,11 +185,9 @@ packages:
   - selinux-policy-targeted
   - setup
   - shadow-utils
-  - sil-abyssinica-fonts
   - sil-mingzat-fonts
   - sil-nuosu-fonts
   - sil-padauk-fonts
-  - smc-meera-fonts
   - sos
   - spice-vdagent
   - sssd