From 7a9e5da06f83b524d9295edbd41c85d69c1ae45d Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Feb 19 2021 09:47:49 +0000
Subject: [PATCH 1/4] repos: Fixup repo names and EOF


---

diff --git a/fedora-34-updates.repo b/fedora-34-updates.repo
index e0e937d..516e164 100644
--- a/fedora-34-updates.repo
+++ b/fedora-34-updates.repo
@@ -3,4 +3,4 @@ name=Fedora 34 $basearch Updates
 mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f34&arch=$basearch
 enabled=0
 gpgcheck=1
-metadata_expire=1d
\ No newline at end of file
+metadata_expire=1d
diff --git a/fedora-34.repo b/fedora-34.repo
index 7e3d722..18b9b5c 100644
--- a/fedora-34.repo
+++ b/fedora-34.repo
@@ -1,6 +1,6 @@
-[fedora-f34]
-name=Fedora f34 $basearch
+[fedora-34]
+name=Fedora 34 $basearch
 mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-34&arch=$basearch
 enabled=0
-gpgcheck=0
+gpgcheck=1
 metadata_expire=1d

From 3fcb9eed981d18ee670a505dca432cdebe20ecfc Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Feb 19 2021 09:54:35 +0000
Subject: [PATCH 2/4] Fix Rawhide -> F34 branching


---

diff --git a/fedora-base.yaml b/fedora-base.yaml
index ed3c178..3601a31 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/34/${basearch}/base
 rojig:
   name: fedora-base
   summary: "Fedora base image for alternative DE"
@@ -12,4 +12,4 @@ packages:
   - xdg-desktop-portal-gtk
 
 repos:
-  - fedora-rawhide
+  - fedora-34
diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml
index e66c6cc..3018aff 100644
--- a/fedora-common-ostree.yaml
+++ b/fedora-common-ostree.yaml
@@ -1,4 +1,4 @@
-ref: fedora/rawhide/${basearch}/ostree-base
+ref: fedora/34/${basearch}/ostree-base
 
 automatic_version_prefix: "34"
 mutate-os-release: "34"

From 46439e6e429e2f39c74326ffdeccddc7a9c8f24b Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Feb 19 2021 10:03:56 +0000
Subject: [PATCH 3/4] Pre-enable updates repo


This repo is currently empty but will be used after F34 is released.
This is a noop for official variants built via Pungi but useful for
unofficial ones.

---

diff --git a/fedora-base.yaml b/fedora-base.yaml
index 3601a31..d0ed67e 100644
--- a/fedora-base.yaml
+++ b/fedora-base.yaml
@@ -13,3 +13,4 @@ packages:
 
 repos:
   - fedora-34
+  - fedora-34-updates
diff --git a/fedora-deepin.yaml b/fedora-deepin.yaml
index 11edbe0..4808cd8 100644
--- a/fedora-deepin.yaml
+++ b/fedora-deepin.yaml
@@ -10,3 +10,4 @@ packages:
 
 repos:
   - fedora-34
+  - fedora-34-updates
diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml
index 94d4be2..67cddec 100644
--- a/fedora-kinoite.yaml
+++ b/fedora-kinoite.yaml
@@ -17,3 +17,4 @@ packages:
 
 repos:
   - fedora-34
+  - fedora-34-updates
diff --git a/fedora-lxqt.yaml b/fedora-lxqt.yaml
index eabd25e..7106dfc 100644
--- a/fedora-lxqt.yaml
+++ b/fedora-lxqt.yaml
@@ -11,3 +11,4 @@ packages:
 
 repos:
   - fedora-34
+  - fedora-34-updates
diff --git a/fedora-mate.yaml b/fedora-mate.yaml
index beacb4c..948010d 100644
--- a/fedora-mate.yaml
+++ b/fedora-mate.yaml
@@ -14,3 +14,4 @@ exclude-packages:
 
 repos:
   - fedora-34
+  - fedora-34-updates
diff --git a/fedora-pantheon.yaml b/fedora-pantheon.yaml
index 811d7f6..455de5b 100644
--- a/fedora-pantheon.yaml
+++ b/fedora-pantheon.yaml
@@ -8,3 +8,4 @@ packages:
 
 repos:
   - fedora-34
+  - fedora-34-updates
diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml
index f6db615..908e8cf 100644
--- a/fedora-silverblue.yaml
+++ b/fedora-silverblue.yaml
@@ -17,3 +17,4 @@ packages:
 
 repos:
   - fedora-34
+  - fedora-34-updates
diff --git a/fedora-xfce.yaml b/fedora-xfce.yaml
index 088d1ea..5da1f1b 100644
--- a/fedora-xfce.yaml
+++ b/fedora-xfce.yaml
@@ -9,3 +9,4 @@ packages:
   - xdg-desktop-portal-gtk
 repos:
   - fedora-34
+  - fedora-34-updates

From aa574371b8145cb8b4dd6c38ad56851e530d0b6f Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Feb 19 2021 10:13:32 +0000
Subject: [PATCH 4/4] Use sqlite instead of bdb for rpmdb


---

diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml
index 3018aff..03e476a 100644
--- a/fedora-common-ostree.yaml
+++ b/fedora-common-ostree.yaml
@@ -42,6 +42,9 @@ etc-group-members:
   - wheel
 tmp-is-dir: true
 
+# We can drop this when it's the rpm-ostree default
+rpmdb: sqlite
+
 postprocess-script: post.sh
 
 ignore-removed-users:

