From c6e3b0f21fcc01fdaca15c229f0bd9521308da87 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Sep 28 2021 16:55:25 +0000
Subject: [PATCH 1/4] fedora-35.repo: Fix repo name


---

diff --git a/fedora-35.repo b/fedora-35.repo
index 7ed589a..63e07cb 100644
--- a/fedora-35.repo
+++ b/fedora-35.repo
@@ -1,4 +1,4 @@
-[fedora-f35]
+[fedora-35]
 name=Fedora f35 $basearch
 mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-35&arch=$basearch
 enabled=0

From f53887a8dca2dcb3f21181148672d17e1f0f9d3f Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Sep 28 2021 16:55:25 +0000
Subject: [PATCH 2/4] Base variant: Use F35 repos and not rawhide


---

diff --git a/fedora-base.yaml b/fedora-base.yaml
index 9c7f93e..40e3b69 100644
--- a/fedora-base.yaml
+++ b/fedora-base.yaml
@@ -1,5 +1,5 @@
 include: fedora-common-ostree.yaml
-ref: fedora/rawhide/${basearch}/base
+ref: fedora/35/${basearch}/base
 rojig:
   name: fedora-base
   summary: "Fedora base image for alternative DE"
@@ -15,4 +15,4 @@ packages:
   - xdg-desktop-portal-gtk
 
 repos:
-  - fedora-rawhide
+  - fedora-35

From 32dd3310b91c2f8b124cd72d5ff2e0e714d64f95 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Sep 28 2021 17:00:28 +0000
Subject: [PATCH 3/4] Mate: Ignore wireplubmer and use release package from comps


---

diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index 1f73e12..f52f7a8 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -262,5 +262,5 @@ desktop_exclude_list:
     - NetworkManager-strongswan-gnome
     - NetworkManager-team
     - NetworkManager-wifi
-    # Use Silverblue release package for now
-    - fedora-release-matecompiz
+    # Already in the common set
+    - wireplumber
diff --git a/fedora-mate.yaml b/fedora-mate.yaml
index af27ee8..a115e05 100644
--- a/fedora-mate.yaml
+++ b/fedora-mate.yaml
@@ -5,7 +5,6 @@ rojig:
   summary: "Fedora Mate base image"
   license: MIT
 packages:
-  - fedora-release-matecompiz
   # Generic release sub package for desktop variants
   - fedora-release-ostree-desktop
   # Portals for Flatpak

From ca52cb0bd9d1349a9cca4555498e95822bd0c38e Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Sep 28 2021 17:00:28 +0000
Subject: [PATCH 4/4] comps-sync f35 2021-09-28


---

diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml
index 6a01d5a..9c675f0 100644
--- a/fedora-common-ostree-pkgs.yaml
+++ b/fedora-common-ostree-pkgs.yaml
@@ -201,6 +201,7 @@ packages:
   - vim-minimal
   - wget
   - which
+  - wireplumber
   - words
   - wpa_supplicant
   - xorg-x11-drv-amdgpu
diff --git a/mate-desktop-pkgs.yaml b/mate-desktop-pkgs.yaml
index cadcaad..45c141b 100644
--- a/mate-desktop-pkgs.yaml
+++ b/mate-desktop-pkgs.yaml
@@ -23,10 +23,11 @@ packages:
   - dconf-editor
   - engrampa
   - eom
-  - f34-backgrounds-base
-  - f34-backgrounds-extras-base
-  - f34-backgrounds-extras-mate
-  - f34-backgrounds-mate
+  - f35-backgrounds-base
+  - f35-backgrounds-extras-base
+  - f35-backgrounds-extras-mate
+  - f35-backgrounds-mate
+  - fedora-release-matecompiz
   - firefox
   - firewall-config
   - gnome-epub-thumbnailer