From 9c87196740d109b1d05fefe9deb7d82ca305842d Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Mar 19 2026 08:35:59 +0000
Subject: [PATCH 1/3] comps-sync-exclude-list: Exclude git-core


We have git-core explicitly added in the common manifest.

---

diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index 1a72bc6..a50a6e0 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -273,6 +273,8 @@ desktop_exclude_list:
   swaywm-extended:
     # Non-critical apps -> Flatpak
     - mpv
+    # Explicitly added in common.yaml
+    - git-core
   cinnamon-desktop:
     # Incompatible with ostree for various reasons
     - abrt-desktop

From c61817c666cdb7745b6ea7c1749bc2d8ee23bcd2 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Mar 19 2026 08:35:59 +0000
Subject: [PATCH 2/3] comps-sync f42 2026-03-19


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

---

diff --git a/cosmic-atomic-packages.yaml b/cosmic-atomic-packages.yaml
index 2c25ee2..26ea174 100644
--- a/cosmic-atomic-packages.yaml
+++ b/cosmic-atomic-packages.yaml
@@ -15,4 +15,5 @@ packages:
   - mesa-dri-drivers
   - mesa-vulkan-drivers
   - plymouth-system-theme
+  - system-config-printer
   - toolbox

From 281c6adf618f285bbba5e2a9a1c4fc9d65fad1e8 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Mar 19 2026 08:35:59 +0000
Subject: [PATCH 3/3] common: Workaround broken appstream cache update


See: https://gitlab.com/fedora/ostree/sig/-/work_items/103

---

diff --git a/common.yaml b/common.yaml
index e306b87..4e3784d 100644
--- a/common.yaml
+++ b/common.yaml
@@ -192,3 +192,32 @@ postprocess:
     # Fix triggerin for samba-client in cups package (not supported by rpm-ostree yet)
     # https://github.com/fedora-silverblue/issue-tracker/issues/532
     ln -snf /usr/libexec/samba/cups_backend_smb /usr/lib/cups/backend/smb
+
+    # Workaround broken appstream cache update
+    # See: https://gitlab.com/fedora/ostree/sig/-/work_items/103
+    cat > /usr/lib/systemd/system/fedora-atomic-desktop-appstream-cache-refresh.service << 'EOF'
+    [Unit]
+    Description=Workaround for Atomic Destkops to refresh the appstream cache
+    Documentation=https://gitlab.com/fedora/ostree/sig/-/work_items/103
+    ConditionPathIsReadWrite=/var
+    ConditionPathExists=/run/ostree-booted
+    After=local-fs.target
+
+    [Service]
+    Type=oneshot
+    RemainAfterExit=yes
+    ExecStart=appstreamcli refresh --force
+    Nice=19
+    IOWeight=10
+
+    [Install]
+    WantedBy=multi-user.target
+    EOF
+
+    cat >> /usr/lib/systemd/system-preset/81-atomic-desktop.preset << 'EOF'
+
+    # See: https://gitlab.com/fedora/ostree/sig/-/work_items/103
+    enable fedora-atomic-desktop-appstream-cache-refresh.service
+    EOF
+
+    systemctl preset fedora-atomic-desktop-appstream-cache-refresh.service