From 12c416c9accd7221b9d94db5043ace2c04fd2663 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Thu, 23 Sep 2021 15:29:41 -0700
Subject: [PATCH] pkgdb for gnome software: add duplicate enties for Fedora
 Linux in f35+

In F35,
https://fedoraproject.org/wiki/Changes/Fedora_Linux_in_os-release
changes the name of Fedora installs from Fedora to Fedora Linux.
gnome-software uses this key to read this faugh pkgdb file to tell when
to offer dist upgrades. We need to handle older versions that see
"Fedora" as well as new ones that see "Fedora Linux".
See https://pagure.io/fedora-infrastructure/issue/10154 for more info

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 .../pkgdb-gnome-software-collections.json     | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json b/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json
index 47369760f3..4007a91616 100644
--- a/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json
+++ b/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json
@@ -1,5 +1,16 @@
 {
   "collections": [
+    {
+      "allow_retire": true,
+      "branchname": "master",
+      "date_created": "2014-05-14 12:36:15",
+      "date_updated": "2020-08-10 17:07:23",
+      "dist_tag": ".fc36",
+      "koji_name": "rawhide",
+      "name": "Fedora Linux",
+      "status": "Under Development",
+      "version": "devel"
+    },
     {
       "allow_retire": true,
       "branchname": "master",
@@ -11,6 +22,17 @@
       "status": "Under Development",
       "version": "devel"
     },
+    {
+      "allow_retire": false,
+      "branchname": "f35",
+      "date_created": "2014-08-11 12:36:15",
+      "date_updated": "2020-08-10 17:07:23",
+      "dist_tag": ".fc35",
+      "koji_name": "f35",
+      "name": "Fedora Linux",
+      "status": "Under Development",
+      "version": "35"
+    },
     {
       "allow_retire": false,
       "branchname": "f35",