From a654df0e591b8110330c20ded626751ca423c84d Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Jan 24 2023 09:25:42 +0000
Subject: [PATCH 1/3] comps-sync: Do not exclude ncurses


The comps group that we are pulling from do not include ncurses and we
explicitely include it in fedora-common-ostree.yaml thus we don't need
to exclude it.

---

diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index 9165ed6..7dcb690 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -48,8 +48,6 @@ exclude_list:
     - fedora-release-workstation
     # Really not worth listing explicitly
     - filesystem
-    # Why?
-    - ncurses
     - mailcap
     # This seems like some weird legacy thing, it also
     # drags in usermode, which should also be deprecated

From 18f3fdf9754de4e8768a9d0e2282341d6b7c2e40 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Jan 24 2023 09:25:42 +0000
Subject: [PATCH 2/3] Update comments about package inclusion


---

diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index 7dcb690..1875303 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -66,7 +66,7 @@ exclude_list:
     - abrt-java-connector
     # Requires libreoffice
     - unoconv
-    # Will change to git-core
+    # Will change to git-core as git pulls in Perl
     - git
     # Apps
     - rhythmbox
diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml
index 40008c0..7cf1b9a 100644
--- a/fedora-common-ostree.yaml
+++ b/fedora-common-ostree.yaml
@@ -19,6 +19,8 @@ packages:
   - git-core-doc
   - lvm2
   - rpm-ostree
+  # Required for compatibility with old bootloaders until we have bootupd
+  # See https://github.com/fedora-silverblue/issue-tracker/issues/120
   - ostree-grub2
   # Container management
   - buildah

From 637f441ba381414a742e0e16c80725b697fc4aca Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Jan 24 2023 09:26:12 +0000
Subject: [PATCH 3/3] comps-sync f38 2023-01-24


See: https://pagure.io/fedora-comps/pull-request/789

---

diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml
index cf9a3fc..e457299 100644
--- a/fedora-common-ostree-pkgs.yaml
+++ b/fedora-common-ostree-pkgs.yaml
@@ -43,8 +43,10 @@ packages:
   - exfatprogs
   - fedora-bookmarks
   - fedora-chromium-config
+  - fedora-flathub-remote
   - fedora-repos-modular
   - fedora-workstation-backgrounds
+  - fedora-workstation-repositories
   - file
   - filesystem
   - firefox