From b05798adf1de087048fb3339fedaa076b245c823 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Feb 24 2020 11:52:21 +0000
Subject: [PATCH 1/5] fedora-31*.repo: use HTTPS & update URLs


Signed-off-by: Timothée Ravier <tim@siosm.fr>

---

diff --git a/fedora-31-updates.repo b/fedora-31-updates.repo
index f8ebf87..7f471af 100644
--- a/fedora-31-updates.repo
+++ b/fedora-31-updates.repo
@@ -1,7 +1,7 @@
 [fedora-31-updates]
 name=Fedora 31 $basearch Updates
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux//updates/31/$basearch/os/
+#baseurl=https://download.fedoraproject.org/pub/fedora/linux/updates/31/$basearch/os/
 mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f31&arch=$basearch
-enabled=0
+enabled=1
 gpgcheck=1
-metadata_expire=1d 
\ No newline at end of file
+metadata_expire=1d
diff --git a/fedora-31.repo b/fedora-31.repo
index 8f2edde..c76433b 100644
--- a/fedora-31.repo
+++ b/fedora-31.repo
@@ -1,7 +1,7 @@
 [fedora-31]
 name=Fedora 31 $basearch
-baseurl=http://download.fedoraproject.org/pub/fedora/linux//development/31/Everything/$basearch/os/
+baseurl=https://download.fedoraproject.org/pub/fedora/linux/releases/31/Everything/$basearch/os/
 #mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=31&arch=$basearch
-enabled=0
+enabled=1
 gpgcheck=1
-metadata_expire=1d
\ No newline at end of file
+metadata_expire=1d

From ead927a9079220c8d7c19c3b40ce84082ef22d93 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Feb 24 2020 11:52:21 +0000
Subject: [PATCH 2/5] Enable fedora-31-updates repo


Signed-off-by: Timothée Ravier <tim@siosm.fr>

---

diff --git a/fedora-deepin.yaml b/fedora-deepin.yaml
index 3f0a07d..dbc332a 100644
--- a/fedora-deepin.yaml
+++ b/fedora-deepin.yaml
@@ -8,3 +8,4 @@ packages:
 
 repos:
   - fedora-31
+  - fedora-31-updates
diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml
index 857bd4d..af1d241 100644
--- a/fedora-kinoite.yaml
+++ b/fedora-kinoite.yaml
@@ -15,3 +15,4 @@ packages:
 
 repos:
   - fedora-31
+  - fedora-31-updates
diff --git a/fedora-lxqt.yaml b/fedora-lxqt.yaml
index f316f03..3c18069 100644
--- a/fedora-lxqt.yaml
+++ b/fedora-lxqt.yaml
@@ -11,3 +11,4 @@ packages:
 
 repos:
   - fedora-31
+  - fedora-31-updates
diff --git a/fedora-pantheon.yaml b/fedora-pantheon.yaml
index 2ca3231..3dc18a2 100644
--- a/fedora-pantheon.yaml
+++ b/fedora-pantheon.yaml
@@ -8,3 +8,4 @@ packages:
 
 repos:
   - fedora-31
+  - fedora-31-updates
diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml
index a4ec7af..48ec745 100644
--- a/fedora-silverblue.yaml
+++ b/fedora-silverblue.yaml
@@ -14,3 +14,4 @@ packages:
 
 repos:
   - fedora-31
+  - fedora-31-updates
diff --git a/fedora-xfce.yaml b/fedora-xfce.yaml
index 6923507..348c287 100644
--- a/fedora-xfce.yaml
+++ b/fedora-xfce.yaml
@@ -9,3 +9,4 @@ packages:
   - xdg-desktop-portal-gtk
 repos:
   - fedora-31
+  - fedora-31-updates

From cc764633a6886c72c67485de9b803301e323bbed Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Feb 24 2020 11:52:21 +0000
Subject: [PATCH 3/5] Common packages: Blacklist scl-utils


Podman & toolbox provide a better alternative.

Signed-off-by: Timothée Ravier <tim@siosm.fr>

---

diff --git a/comps-sync-blacklist.yml b/comps-sync-blacklist.yml
index 350b3cd..25da84a 100644
--- a/comps-sync-blacklist.yml
+++ b/comps-sync-blacklist.yml
@@ -111,6 +111,8 @@ blacklist:
     # x86 specific packages. Added back by fedora-common-ostree.yaml
     - mcelog
     - microcode_ctl
+    # Use podman or toolbox instead
+    - scl-utils
   networkmanager-submodules:
     # Let's use the builtin one by default
     - dhcp-client
diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml
index 57e501d..0bf2764 100644
--- a/fedora-common-ostree-pkgs.yaml
+++ b/fedora-common-ostree-pkgs.yaml
@@ -176,7 +176,6 @@ packages:
   - rpm
   - rsync
   - samba-client
-  - scl-utils
   - selinux-policy-targeted
   - setup
   - shadow-utils

From 1efc090fd2a8a85c97e511842e146bd448061de6 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Feb 24 2020 11:52:21 +0000
Subject: [PATCH 4/5] Re-add gnome-keyring-pam for KDE variant


This is required for keyring unlock for users sessions.

Signed-off-by: Timothée Ravier <tim@siosm.fr>

---

diff --git a/comps-sync-blacklist.yml b/comps-sync-blacklist.yml
index 25da84a..ffb76e4 100644
--- a/comps-sync-blacklist.yml
+++ b/comps-sync-blacklist.yml
@@ -170,7 +170,6 @@ desktop_blacklist:
     # Non-critical apps -> Flatpak
     - akregator
     - cagibi
-    - gnome-keyring-pam
     - gwenview
     - kaddressbook
     - kamera
diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml
index 07b9445..21d273e 100644
--- a/kde-desktop-pkgs.yaml
+++ b/kde-desktop-pkgs.yaml
@@ -6,6 +6,7 @@ packages:
   - breeze-icon-theme
   - dolphin
   - glibc-all-langpacks
+  - gnome-keyring-pam
   - initial-setup-gui
   - kde-gtk-config
   - kde-print-manager

From a1950c319ac7441650ac90cd94ab8c9d0f4c8789 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Feb 24 2020 11:52:21 +0000
Subject: [PATCH 5/5] kde & lxqt: keep an archive manager in the base image


Keep Arck (an archive manager) in the base image until we can install
flatpaks by default.

Signed-off-by: Timothée Ravier <tim@siosm.fr>

---

diff --git a/comps-sync-blacklist.yml b/comps-sync-blacklist.yml
index ffb76e4..443c6b3 100644
--- a/comps-sync-blacklist.yml
+++ b/comps-sync-blacklist.yml
@@ -231,8 +231,6 @@ desktop_blacklist:
   lxqt-desktop:
     # Incompatible with ostree for various reasons
     - dnfdragora-updater
-    # Non-critical apps -> Flatpak
-    - ark
   deepin-desktop:
     # Incompatible with ostree for various reasons
     - dnfdragora-updater
diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml
index af1d241..9354e27 100644
--- a/fedora-kinoite.yaml
+++ b/fedora-kinoite.yaml
@@ -12,6 +12,8 @@ packages:
   - xorg-x11-server-Xwayland
   # Portals for Flatpak
   - xdg-desktop-portal-kde
+  # Provide an archive manager by default
+  - ark
 
 repos:
   - fedora-31
diff --git a/lxqt-desktop-pkgs.yaml b/lxqt-desktop-pkgs.yaml
index f044dd4..c6de606 100644
--- a/lxqt-desktop-pkgs.yaml
+++ b/lxqt-desktop-pkgs.yaml
@@ -1,6 +1,7 @@
 # DO NOT EDIT! This content is generated from comps-sync.py
 include: fedora-common-ostree.yaml
 packages:
+  - ark
   - breeze-cursor-theme
   - breeze-gtk
   - breeze-icon-theme

