From efb02ef8c7a2e725802cf150f4ecbe87e53c753c Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@redhat.com>
Date: Tue, 20 Feb 2018 12:21:41 -0500
Subject: [PATCH 001/108] Setup for rawhide being f29

Signed-off-by: Mohan Boddu <mboddu@redhat.com>
---
 fedora-repos.spec | 14 ++++----------
 sources           |  2 +-
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index cb1075b..d9940d4 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,7 +1,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
-Version:        28
-Release:        0.3%{?_module_build:%{?dist}}
+Version:        29
+Release:        0.1%{?_module_build:%{?dist}}
 License:        MIT
 Group:          System Environment/Base
 URL:            https://pagure.io/fedora-repos/
@@ -84,11 +84,5 @@ done
 /etc/pki/rpm-gpg/*
 
 %changelog
-* Mon Sep 25 2017 Stephen Gallagher <sgallagh@redhat.com> - 28-0.3
-- Add a dist tag when building for modules
-
-* Fri Sep 22 2017 Patrick Uiterwijk <patrick@puiterwijk.org> - 28-0.2
-- Split out GPG keys into fedora-gpg-keys
-
-* Tue Aug 15 2017 Mohan Boddu <mboddu@redhat.com> - 28-0.1
-- Setup for rawhide being f28
+* Mon Feb 19 2018 Mohan Boddu <mboddu@redhat.com> - 29-0.1
+- Setup for rawhide being f29
diff --git a/sources b/sources
index 41de8fe..7613dd4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fedora-repos-28.tar.bz2) = 6bfd7028f382df97727d8e9f68a4bfce309dabb02af80149e671fce906c65f046c04549be36dda51e2dc993dea89041730d095dfeb16f6cd18a53cb55a17e896
+SHA512 (fedora-repos-29.tar.bz2) = b7a3b74776d394f86999b4ec47f672179dd0b1d87132c318cb997742bcc30470bebb617c28f4d07fb79916c787d728fa3a3421cf3d509ac0760e4082d5e6fcdd

From 9542f6250122f4a7e9fa1f8a0a2148b434ca7858 Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@redhat.com>
Date: Sat, 10 Mar 2018 14:43:25 -0500
Subject: [PATCH 002/108] add changes for the new modular setup

Signed-off-by: Mohan Boddu <mboddu@redhat.com>
---
 fedora-repos.spec | 7 ++++++-
 sources           | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index d9940d4..e2ab066 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,7 +1,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        29
-Release:        0.1%{?_module_build:%{?dist}}
+Release:        0.2%{?_module_build:%{?dist}}
 License:        MIT
 Group:          System Environment/Base
 URL:            https://pagure.io/fedora-repos/
@@ -72,17 +72,22 @@ done
 %defattr(-,root,root,-)
 %dir /etc/yum.repos.d
 %config(noreplace) /etc/yum.repos.d/fedora.repo
+%config(noreplace) /etc/yum.repos.d/fedora-modular.repo
 %config(noreplace) /etc/yum.repos.d/fedora-cisco-openh264.repo
 %config(noreplace) /etc/yum.repos.d/fedora-updates*.repo
 
 %files rawhide
 %defattr(-,root,root,-)
 %config(noreplace) /etc/yum.repos.d/fedora-rawhide.repo
+%config(noreplace) /etc/yum.repos.d/fedora-rawhide-modular.repo
 
 %files -n fedora-gpg-keys
 %dir /etc/pki/rpm-gpg
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Sat Feb 24 2018 Dennis Gilmore <dennis@ausil.us> - 29-0.2
+- add changes for the new modular setup
+
 * Mon Feb 19 2018 Mohan Boddu <mboddu@redhat.com> - 29-0.1
 - Setup for rawhide being f29
diff --git a/sources b/sources
index 7613dd4..3cd8a77 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fedora-repos-29.tar.bz2) = b7a3b74776d394f86999b4ec47f672179dd0b1d87132c318cb997742bcc30470bebb617c28f4d07fb79916c787d728fa3a3421cf3d509ac0760e4082d5e6fcdd
+SHA512 (fedora-repos-29.tar.bz2) = 53f9b48e54f1419b12d40e0be5fab79a10a93b147391d07cd8a237275c4129d2773e8dcf9834ef4c343f08d90ec17092215d73e25de14abc99c3b0e61d008a89

From 6389bbc16a62f5853c16ddaf4bb0f357bb8d921e Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@redhat.com>
Date: Sat, 10 Mar 2018 16:42:57 -0500
Subject: [PATCH 003/108] fix up the baseurls in updates-testing

Signed-off-by: Mohan Boddu <mboddu@redhat.com>
---
 fedora-repos.spec | 5 ++++-
 sources           | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index e2ab066..a7ba98d 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,7 +1,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        29
-Release:        0.2%{?_module_build:%{?dist}}
+Release:        0.3%{?_module_build:%{?dist}}
 License:        MIT
 Group:          System Environment/Base
 URL:            https://pagure.io/fedora-repos/
@@ -86,6 +86,9 @@ done
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Sat Mar 10 2018 Dennis Gilmore <dennis@ausil.us> - 29-0.3
+- fix up the baseurls in updates-testing
+
 * Sat Feb 24 2018 Dennis Gilmore <dennis@ausil.us> - 29-0.2
 - add changes for the new modular setup
 
diff --git a/sources b/sources
index 3cd8a77..b3b3d67 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fedora-repos-29.tar.bz2) = 53f9b48e54f1419b12d40e0be5fab79a10a93b147391d07cd8a237275c4129d2773e8dcf9834ef4c343f08d90ec17092215d73e25de14abc99c3b0e61d008a89
+SHA512 (fedora-repos-29.tar.bz2) = b5563542e74d3cce484727770c2945d7deb58198e9bf07eeda57bb93fee362425447d3172cda0148f413b698ac018382b6ca7d3ed6001c2a4fb2cc895d538775

From c82041b07d7ce04472114c4c64d1c9733e14bbf1 Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@redhat.com>
Date: Mon, 9 Apr 2018 10:16:58 -0400
Subject: [PATCH 004/108] Move modular repos to a subpackage

Signed-off-by: Mohan Boddu <mboddu@redhat.com>
---
 fedora-repos.spec | 33 +++++++++++++++++++++++++++++++--
 sources           |  2 +-
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index a7ba98d..63fafa3 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,7 +1,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        29
-Release:        0.3%{?_module_build:%{?dist}}
+Release:        0.4%{?_module_build:%{?dist}}
 License:        MIT
 Group:          System Environment/Base
 URL:            https://pagure.io/fedora-repos/
@@ -25,6 +25,22 @@ Obsoletes:      fedora-release-rawhide <= 22-0.3
 %description rawhide
 This package provides the rawhide repo definitions.
 
+%package modular
+Summary:        Modular repo definitions
+Requires:       fedora-repos = %{version}-%{release}
+
+%description modular
+This package provides the modular repo definitions.
+
+%package rawhide-modular
+Summary:        Rawhide modular repo definitions
+Requires:       fedora-repos = %{version}-%{release}
+Requires:       fedora-repos-rawhide = %{version}-%{release}
+
+%description rawhide-modular
+This package provides the rawhide modular repo definitions.
+
+
 
 %package -n fedora-gpg-keys
 Summary:        Fedora RPM keys
@@ -74,11 +90,21 @@ done
 %config(noreplace) /etc/yum.repos.d/fedora.repo
 %config(noreplace) /etc/yum.repos.d/fedora-modular.repo
 %config(noreplace) /etc/yum.repos.d/fedora-cisco-openh264.repo
-%config(noreplace) /etc/yum.repos.d/fedora-updates*.repo
+%config(noreplace) /etc/yum.repos.d/fedora-updates.repo
+%config(noreplace) /etc/yum.repos.d/fedora-updates-testing.repo
 
 %files rawhide
 %defattr(-,root,root,-)
 %config(noreplace) /etc/yum.repos.d/fedora-rawhide.repo
+
+%files modular
+%config(noreplace) /etc/yum.repos.d/fedora-modular.repo
+%config(noreplace) /etc/yum.repos.d/fedora-updates-modular.repo
+%config(noreplace) /etc/yum.repos.d/fedora-updates-testing-modular.repo
+
+
+
+%files rawhide-modular
 %config(noreplace) /etc/yum.repos.d/fedora-rawhide-modular.repo
 
 %files -n fedora-gpg-keys
@@ -86,6 +112,9 @@ done
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Mon Mar 12 2018 Stephen Gallagher <sgallagh@redhat.com> - 29-0.4
+- Move modular repos to a subpackage
+
 * Sat Mar 10 2018 Dennis Gilmore <dennis@ausil.us> - 29-0.3
 - fix up the baseurls in updates-testing
 
diff --git a/sources b/sources
index b3b3d67..29aafb1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fedora-repos-29.tar.bz2) = b5563542e74d3cce484727770c2945d7deb58198e9bf07eeda57bb93fee362425447d3172cda0148f413b698ac018382b6ca7d3ed6001c2a4fb2cc895d538775
+SHA512 (fedora-repos-29.tar.bz2) = 943f5863536de366226dccb91017244d6775efae40fe335f862a51f5fcdecd1ed6791f8ec0e09d61e2410254e5ee2914f365aa7f0645675f31f96e159d915896

From c8ee8f154d0aebcd91cac71aa8d7402544574340 Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@redhat.com>
Date: Mon, 21 May 2018 09:18:34 -0400
Subject: [PATCH 005/108] Baseurl fixes

Signed-off-by: Mohan Boddu <mboddu@redhat.com>
---
 fedora-repos.spec | 5 ++++-
 sources           | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index 63fafa3..4e9c478 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,7 +1,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        29
-Release:        0.4%{?_module_build:%{?dist}}
+Release:        0.5%{?_module_build:%{?dist}}
 License:        MIT
 Group:          System Environment/Base
 URL:            https://pagure.io/fedora-repos/
@@ -112,6 +112,9 @@ done
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Fri May 18 2018 Mohan Boddu <mboddu@redhat.com> - 29-0.5
+- Baseurl fixes
+
 * Mon Mar 12 2018 Stephen Gallagher <sgallagh@redhat.com> - 29-0.4
 - Move modular repos to a subpackage
 
diff --git a/sources b/sources
index 29aafb1..fd2edd1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fedora-repos-29.tar.bz2) = 943f5863536de366226dccb91017244d6775efae40fe335f862a51f5fcdecd1ed6791f8ec0e09d61e2410254e5ee2914f365aa7f0645675f31f96e159d915896
+SHA512 (fedora-repos-29.tar.bz2) = b57b911ddbf6b03b7e7f734a29868cd9fbc37333b135a950559560f69652d819a5591bc75842118568fee99c7df53a386a3ac30efdb30264072b53c6d1b10cdb

From 7b32bee388d093c446017f1e33309d9b96b24e15 Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@bhujji.com>
Date: Tue, 31 Jul 2018 11:30:51 -0400
Subject: [PATCH 006/108] Merge modular repos into the main package Part of
 https://fedoraproject.org/wiki/Changes/ModulesForEveryone

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
---
 fedora-repos.spec | 40 ++++++++++++++--------------------------
 sources           |  2 +-
 2 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index 4e9c478..0b11a54 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,7 +1,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        29
-Release:        0.5%{?_module_build:%{?dist}}
+Release:        0.6%{?_module_build:%{?dist}}
 License:        MIT
 Group:          System Environment/Base
 URL:            https://pagure.io/fedora-repos/
@@ -12,6 +12,8 @@ Requires:       system-release(%{version})
 Requires:       fedora-repos-rawhide = %{version}-%{release}
 Requires:       fedora-gpg-keys = %{version}-%{release}
 Obsoletes:      fedora-repos-anaconda < 22-0.3
+Obsoletes:      fedora-repos-modular < 29-0.6
+Provides:       fedora-repos-modular = %{version}-%{release}
 BuildArch:      noarch
 
 %description
@@ -21,26 +23,12 @@ Fedora package repository files for yum and dnf along with gpg public keys
 Summary:        Rawhide repo definitions
 Requires:       fedora-repos = %{version}-%{release}
 Obsoletes:      fedora-release-rawhide <= 22-0.3
+Obsoletes:      fedora-repos-rawhide-modular < 29-0.6
+Provides:       fedora-repos-rawhide-modular = %{version}-%{release}
 
 %description rawhide
 This package provides the rawhide repo definitions.
 
-%package modular
-Summary:        Modular repo definitions
-Requires:       fedora-repos = %{version}-%{release}
-
-%description modular
-This package provides the modular repo definitions.
-
-%package rawhide-modular
-Summary:        Rawhide modular repo definitions
-Requires:       fedora-repos = %{version}-%{release}
-Requires:       fedora-repos-rawhide = %{version}-%{release}
-
-%description rawhide-modular
-This package provides the rawhide modular repo definitions.
-
-
 
 %package -n fedora-gpg-keys
 Summary:        Fedora RPM keys
@@ -92,26 +80,26 @@ done
 %config(noreplace) /etc/yum.repos.d/fedora-cisco-openh264.repo
 %config(noreplace) /etc/yum.repos.d/fedora-updates.repo
 %config(noreplace) /etc/yum.repos.d/fedora-updates-testing.repo
-
-%files rawhide
-%defattr(-,root,root,-)
-%config(noreplace) /etc/yum.repos.d/fedora-rawhide.repo
-
-%files modular
 %config(noreplace) /etc/yum.repos.d/fedora-modular.repo
 %config(noreplace) /etc/yum.repos.d/fedora-updates-modular.repo
 %config(noreplace) /etc/yum.repos.d/fedora-updates-testing-modular.repo
 
-
-
-%files rawhide-modular
+%files rawhide
+%defattr(-,root,root,-)
+%config(noreplace) /etc/yum.repos.d/fedora-rawhide.repo
 %config(noreplace) /etc/yum.repos.d/fedora-rawhide-modular.repo
 
+
 %files -n fedora-gpg-keys
 %dir /etc/pki/rpm-gpg
 /etc/pki/rpm-gpg/*
 
+
 %changelog
+* Tue Jul 31 2018 Stephen Gallagher <sgallagh@redhat.com> - 29-0.6
+- Merge modular repos into the main package
+- Part of https://fedoraproject.org/wiki/Changes/ModulesForEveryone
+
 * Fri May 18 2018 Mohan Boddu <mboddu@redhat.com> - 29-0.5
 - Baseurl fixes
 
diff --git a/sources b/sources
index fd2edd1..6e516dd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fedora-repos-29.tar.bz2) = b57b911ddbf6b03b7e7f734a29868cd9fbc37333b135a950559560f69652d819a5591bc75842118568fee99c7df53a386a3ac30efdb30264072b53c6d1b10cdb
+SHA512 (fedora-repos-29.tar.bz2) = 3086d45bc6531faf7912ff01a0d451a08b6b2a698c598784a72de48fbd4a2f33c4cbb890f181129420022815ccc6a1f65f94d5471e6ff28621c6f4c3ca949f00

From 3f78e97c438ec187baccfead027feaa643d46197 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Thu, 9 Aug 2018 10:53:42 +0100
Subject: [PATCH 007/108] Minor cleanups, drop defattr and Group

Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
---
 fedora-repos.spec | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index 0b11a54..60537d9 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -3,7 +3,6 @@ Name:           fedora-repos
 Version:        29
 Release:        0.6%{?_module_build:%{?dist}}
 License:        MIT
-Group:          System Environment/Base
 URL:            https://pagure.io/fedora-repos/
 # tarball is created by running make archive in the git checkout
 Source:         %{name}-%{version}.tar.bz2
@@ -73,7 +72,6 @@ done
 
 
 %files
-%defattr(-,root,root,-)
 %dir /etc/yum.repos.d
 %config(noreplace) /etc/yum.repos.d/fedora.repo
 %config(noreplace) /etc/yum.repos.d/fedora-modular.repo
@@ -85,7 +83,6 @@ done
 %config(noreplace) /etc/yum.repos.d/fedora-updates-testing-modular.repo
 
 %files rawhide
-%defattr(-,root,root,-)
 %config(noreplace) /etc/yum.repos.d/fedora-rawhide.repo
 %config(noreplace) /etc/yum.repos.d/fedora-rawhide-modular.repo
 

From 270c89bcbf69c3c2c7e42fec5339346f49eab995 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Thu, 9 Aug 2018 11:00:52 +0100
Subject: [PATCH 008/108] Import the actual contents of the fedora-repos tar
 and adjust build

Import tar file contents to contain the contents of fedora-repos from the
distro git repository. This then becomes the one canonical location of the
status and all changes are then to be submitted to the src.fedoraproject.org
qpackage repo as git commits to be reviewed.

Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
---
 RPM-GPG-KEY-fedora-10-primary         | 40 +++++++++++++++
 RPM-GPG-KEY-fedora-11-primary         | 29 +++++++++++
 RPM-GPG-KEY-fedora-12-primary         | 29 +++++++++++
 RPM-GPG-KEY-fedora-13-primary         | 29 +++++++++++
 RPM-GPG-KEY-fedora-13-secondary       | 62 +++++++++++++++++++++++
 RPM-GPG-KEY-fedora-14-primary         | 29 +++++++++++
 RPM-GPG-KEY-fedora-14-secondary       | 62 +++++++++++++++++++++++
 RPM-GPG-KEY-fedora-15-primary         | 29 +++++++++++
 RPM-GPG-KEY-fedora-15-secondary       | 62 +++++++++++++++++++++++
 RPM-GPG-KEY-fedora-16-primary         | 29 +++++++++++
 RPM-GPG-KEY-fedora-16-secondary       | 62 +++++++++++++++++++++++
 RPM-GPG-KEY-fedora-17-primary         | 29 +++++++++++
 RPM-GPG-KEY-fedora-17-secondary       | 63 +++++++++++++++++++++++
 RPM-GPG-KEY-fedora-18-primary         | 29 +++++++++++
 RPM-GPG-KEY-fedora-18-secondary       | 63 +++++++++++++++++++++++
 RPM-GPG-KEY-fedora-19-primary         | 29 +++++++++++
 RPM-GPG-KEY-fedora-19-secondary       | 62 +++++++++++++++++++++++
 RPM-GPG-KEY-fedora-20-primary         | 29 +++++++++++
 RPM-GPG-KEY-fedora-20-secondary       | 62 +++++++++++++++++++++++
 RPM-GPG-KEY-fedora-21-primary         | 29 +++++++++++
 RPM-GPG-KEY-fedora-21-secondary       | 62 +++++++++++++++++++++++
 RPM-GPG-KEY-fedora-22-primary         | 29 +++++++++++
 RPM-GPG-KEY-fedora-22-secondary       | 62 +++++++++++++++++++++++
 RPM-GPG-KEY-fedora-23-primary         | 29 +++++++++++
 RPM-GPG-KEY-fedora-23-secondary       | 52 +++++++++++++++++++
 RPM-GPG-KEY-fedora-24-primary         | 29 +++++++++++
 RPM-GPG-KEY-fedora-24-secondary       | 52 +++++++++++++++++++
 RPM-GPG-KEY-fedora-25-primary         | 30 +++++++++++
 RPM-GPG-KEY-fedora-25-secondary       | 52 +++++++++++++++++++
 RPM-GPG-KEY-fedora-26-primary         | 30 +++++++++++
 RPM-GPG-KEY-fedora-26-secondary       | 52 +++++++++++++++++++
 RPM-GPG-KEY-fedora-27-primary         | 28 ++++++++++
 RPM-GPG-KEY-fedora-28-primary         | 28 ++++++++++
 RPM-GPG-KEY-fedora-29-primary         | 28 ++++++++++
 RPM-GPG-KEY-fedora-7-primary          | 27 ++++++++++
 RPM-GPG-KEY-fedora-8-primary          | 40 +++++++++++++++
 RPM-GPG-KEY-fedora-8-primary-original | 27 ++++++++++
 RPM-GPG-KEY-fedora-9-primary          | 40 +++++++++++++++
 RPM-GPG-KEY-fedora-9-primary-original | 27 ++++++++++
 RPM-GPG-KEY-fedora-9-secondary        | 30 +++++++++++
 RPM-GPG-KEY-fedora-modularity         | 29 +++++++++++
 archmap                               | 60 ++++++++++++++++++++++
 fedora-cisco-openh264.repo            | 24 +++++++++
 fedora-modular.repo                   | 38 ++++++++++++++
 fedora-rawhide-modular.repo           | 58 +++++++++++++++++++++
 fedora-rawhide.repo                   | 58 +++++++++++++++++++++
 fedora-repos.spec                     | 73 +++++++++++++++++++++++----
 fedora-updates-modular.repo           | 38 ++++++++++++++
 fedora-updates-testing-modular.repo   | 38 ++++++++++++++
 fedora-updates-testing.repo           | 38 ++++++++++++++
 fedora-updates.repo                   | 38 ++++++++++++++
 fedora.repo                           | 38 ++++++++++++++
 sources                               |  1 -
 53 files changed, 2132 insertions(+), 10 deletions(-)
 create mode 100644 RPM-GPG-KEY-fedora-10-primary
 create mode 100644 RPM-GPG-KEY-fedora-11-primary
 create mode 100644 RPM-GPG-KEY-fedora-12-primary
 create mode 100644 RPM-GPG-KEY-fedora-13-primary
 create mode 100644 RPM-GPG-KEY-fedora-13-secondary
 create mode 100644 RPM-GPG-KEY-fedora-14-primary
 create mode 100644 RPM-GPG-KEY-fedora-14-secondary
 create mode 100644 RPM-GPG-KEY-fedora-15-primary
 create mode 100644 RPM-GPG-KEY-fedora-15-secondary
 create mode 100644 RPM-GPG-KEY-fedora-16-primary
 create mode 100644 RPM-GPG-KEY-fedora-16-secondary
 create mode 100644 RPM-GPG-KEY-fedora-17-primary
 create mode 100644 RPM-GPG-KEY-fedora-17-secondary
 create mode 100644 RPM-GPG-KEY-fedora-18-primary
 create mode 100644 RPM-GPG-KEY-fedora-18-secondary
 create mode 100644 RPM-GPG-KEY-fedora-19-primary
 create mode 100644 RPM-GPG-KEY-fedora-19-secondary
 create mode 100644 RPM-GPG-KEY-fedora-20-primary
 create mode 100644 RPM-GPG-KEY-fedora-20-secondary
 create mode 100644 RPM-GPG-KEY-fedora-21-primary
 create mode 100644 RPM-GPG-KEY-fedora-21-secondary
 create mode 100644 RPM-GPG-KEY-fedora-22-primary
 create mode 100644 RPM-GPG-KEY-fedora-22-secondary
 create mode 100644 RPM-GPG-KEY-fedora-23-primary
 create mode 100644 RPM-GPG-KEY-fedora-23-secondary
 create mode 100644 RPM-GPG-KEY-fedora-24-primary
 create mode 100644 RPM-GPG-KEY-fedora-24-secondary
 create mode 100644 RPM-GPG-KEY-fedora-25-primary
 create mode 100644 RPM-GPG-KEY-fedora-25-secondary
 create mode 100644 RPM-GPG-KEY-fedora-26-primary
 create mode 100644 RPM-GPG-KEY-fedora-26-secondary
 create mode 100644 RPM-GPG-KEY-fedora-27-primary
 create mode 100644 RPM-GPG-KEY-fedora-28-primary
 create mode 100644 RPM-GPG-KEY-fedora-29-primary
 create mode 100644 RPM-GPG-KEY-fedora-7-primary
 create mode 100644 RPM-GPG-KEY-fedora-8-primary
 create mode 100644 RPM-GPG-KEY-fedora-8-primary-original
 create mode 100644 RPM-GPG-KEY-fedora-9-primary
 create mode 100644 RPM-GPG-KEY-fedora-9-primary-original
 create mode 100644 RPM-GPG-KEY-fedora-9-secondary
 create mode 100644 RPM-GPG-KEY-fedora-modularity
 create mode 100644 archmap
 create mode 100644 fedora-cisco-openh264.repo
 create mode 100644 fedora-modular.repo
 create mode 100644 fedora-rawhide-modular.repo
 create mode 100644 fedora-rawhide.repo
 create mode 100644 fedora-updates-modular.repo
 create mode 100644 fedora-updates-testing-modular.repo
 create mode 100644 fedora-updates-testing.repo
 create mode 100644 fedora-updates.repo
 create mode 100644 fedora.repo
 delete mode 100644 sources

diff --git a/RPM-GPG-KEY-fedora-10-primary b/RPM-GPG-KEY-fedora-10-primary
new file mode 100644
index 0000000..7a1385f
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-10-primary
@@ -0,0 +1,40 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+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
+=s6iX
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-11-primary b/RPM-GPG-KEY-fedora-11-primary
new file mode 100644
index 0000000..f88d9c5
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-11-primary
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+mQINBEl1CHEBEACn5bv6rGJW50UJ59QoI5E27q04g3Gv8bH5/wtk8NjwvgTCtGRd
+hfXCWvd4OGZjN67m0tsWmJltC7pCv6i3pnaVsVWo1u36+aoZtdP1tqv7CD3QlnLK
+bx740Oor2YJJvlr7ypFcYPH1+xBZOHXUjPRrqTT6nY6AVm2U/udIVZQHhNG0mc4K
+IHYZeJM3GFOL1sE+PX8zpcGh4MUKBsVcPNVYpD+HPQyDAgQcL4+uOFR0tnonaiWm
+vA7A/4kNokHpbwDY7WwEnGZM6KJUGa2rTNXJ+Vij0ng7mWRZ5/0GcM4/mMX6dn9S
+xghbESiLdip1ZTb60B/ClFZi5PiB12J6DQo2h3+hpxhx0AHJSQRKt+5uw/UyjdmG
+zHROos8KRvTlTXeKj2SsNvjQKrbyQGT0AXVBcuXLbbDjijaIF8EE4SFXkCyU5Do9
+6mEkuEwMcdZ8KQC25gF5jlM0G+nZmcSgZin7b4jRvFEPZ+WbPzB51wijmPuiadWT
+H2ssiBFSHZG0SljVu6vG5YaTwgyB24+1jb/eTSz/wa/Kh8u1loZnWb/F0K2UnA6M
+frDnlpdBskgMjBFXnzOqRYqzyQRCBe4T2IbkzUnQYeiqvJAiVsdVG5/TncxCzhfA
+E9t2gjilRcWGRl8W96M0mHlw2uMkLRDN4BfwmWePlQQ8fGKma+PiO4E9rQARAQAB
+tCZGZWRvcmEgKDExKSA8ZmVkb3JhQGZlZG9yYXByb2plY3Qub3JnPokCNgQTAQIA
+IAUCSe4UCQIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEB3Fx1jSLnfygm0P
+/RIMXuhggaKzYYSrtv4GH8F96643WwmuoGl0hZydNt3WwJCy+pNAmFkCK1NG0K6Y
+HC/7jWKImpl61q0XJwygOZAfpy6DNKsIQkfJdk7afZHruXrapphIbf127pfSayu9
+bWHKc6ZovZ3tt8XjH7p9cU+qfidmTyUVJheIJyLQ9C+Cand3XJ6tR+1catKcGYWR
+Zjjr0gxQWj3T4ow4VP9rju8BRYItgDcfqWSK06HAkp/AbCqJQSwBF5m9mSYokOA2
+YQuYwAcDMjl/dEoGgzm+OLoyj3+mkeMdQTMnjvEirtsVBai5CzHlhukAqUpBBMV4
+MQmNMkYKCCbt/uOuy+Uj6caV1HITZmDUOAu3Qr9Ur1tG4lggLTKSCWrc6sBGdg3Y
+w04XkHppU32bPYPX2QGqMJh9QOQAciZIw22NNffDUI0f467cJ7j+nv1M9lsd5voZ
+BiHN5d7abDr81q22+m7tQzdy2UvYXT0tsEHS6DUWvo4PUW2/IpUOv8SUytxTACiY
+EGYA00q5Ax+h8FPXo1v7Dd2GksLduyByaW0p7P2VyjJTsqkMVEQ2wRNCE8eipg2s
+xpsSU9M29uf7/goHDI6pfXpN+q2uPTLucCEIjG5bDICw3uwWLCJ+AXYLiPzCtn7j
+TaPTZVVFnbBFu75zklD8EtJ1fHJngYTq7yIMNKOJQTyQ
+=moZO
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-12-primary b/RPM-GPG-KEY-fedora-12-primary
new file mode 100644
index 0000000..fece2c7
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-12-primary
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+mQINBEpvl68BEADHaID3riLF8dKEplScdHDoLvVSQA7w4KzRF3sC+4qmh6qxWxvb
+blUlrtkN9jn049g7JEydtBmqmhJpixtq0vMeiHSyyGgl5B1DfQnNCUUJUM+SKdLN
+1XjrsifYlYkpKiWWhStESwHAYeR+NS6ahPqHS2ZRtnSYsVGzr568YOMUqsfh7xOH
+/nugJEY7dHh+BkRkQlG2Sq7w1aIq5cLtHskUhIWG5odUbkzplEvv+t0OFxQfRh47
+l+PknILo7ecyrL55SzD/+R8ANqMu3BeMocwCga7pSl6RfZjdvLC8p8HhJ5gwGzGj
+3YxjLoga0lWNVIhsq/LpS9vPD2mVHsVlSLHsZSTSDr3zQf2nSlaxzZb9zWAW3cVR
+EXy9Ly835b6HFTPqgkclkymV31eDI1BU1AT/5gp7lrzUNA7xbvtQy4VrML/gCO/I
+4G7j5qOIZewlxEMHM1GvEPLPbnC4X3NmKmRogvxg9Sir7DHOq3uHDBQlBYi7FzBG
+QvjgjgjpGcmPLTVuuhzGLr8XFH5Gk3kSji7mrDxAW3sD/16ZQ5xzT8HEx4L+bdCw
+R+i2SpOvKLt2DPeFykAFnpkgHwkqCYtZhzT8QZ/9JR9UvRqPNskkB+41R/jgMw4+
+77dXYNdiL7502vpCvPqaqRuf0kWag9bq1ZBwsqUDz7FV1gvH0Tv+sugBHQARAQAB
+tCZGZWRvcmEgKDEyKSA8ZmVkb3JhQGZlZG9yYXByb2plY3Qub3JnPokCNgQTAQIA
+IAUCSm+XrwIbDwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEJ0cw0hXu8y6N2QP
+/R9wYh4bHYIUOv8ysc188PKXgvHFLGTIJOigqgIFfIl4FP92NlxorVLxQ5M59KWR
+DACsBwKNF4pVXTlULJQc6Mq3noNdFPyvYRfDPXUdOKPX3xNy0NHiuHPuXk8c7T6W
+yaBlZBy5oKaBq1LdoIsaw1vMnyd3Hdo/nh1fcZ19sqGtLwV5t4dmzOSACTi1Fpn+
+/mNKi1xrBwE7tvFpE08zW3uYTK3RKP300mRpcRqG66IVVuHdhRT6jTteyL/vHaw4
+jVyUg040JbJ1itZaqUcLagkSDRw04D1PxllVGr4laHlBEjdoqKwZV5PvMs6AE+zx
+GyFuFtRvAiOPO62g35uZBncGGZaTC+WwXWEaPkjPHxOFVTqemVamL11vEUDfSQqv
+ui9Ul24E06mb5AsHsyiptyrmUDbbpz6Wyo60kaMWSEISoiTGAIFMSimfLVkQLYAQ
+L5Q5AM/rnIHibd6PGFD0Twv7DMp429rw1ItosNRPA6G/BVi0FadN0OoPF5RBJU7z
+4xt0jy5mDHfX2Fc2xSbZPKV9lrvJd8KYdRXCIDwH9e0Dvlf7pw4lvxDvh1WtSbj2
+eNaJlTIksj/Qb3lbdMrZ72GNnIJF1gRkzjFg9ICaGrhMHQQ8phjwC4ME1h6iEVAJ
+5InJW4stZl1Bdl1NdxvQIbboVmtruN2VhgKKbXEFk1f+
+=f8U5
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-13-primary b/RPM-GPG-KEY-fedora-13-primary
new file mode 100644
index 0000000..8da5ae3
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-13-primary
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+mQINBEtWPNwBEADjDowYLqGZJevWtPil9jpwrN2gUE5YdKSpdN+FmeS4PaBjM293
+O56WY1vElOFbD/wO0+UsYsSU3J+Wfz/6hNnC953mNN4d6luT2tMs0Qc5LZ4Xmsod
+a5BWlr1tASUBA/DPiS1mtdKm3n6WuW3fZYydRK2EBskv9tuA3LKgmm9e9OcbTJjC
+lUdtw7868WqR2aU383l9G9HPoN6aR4EKgNgSefdNPTsxD04xbLo/aSHAG85fvXmg
+2z2sVOw3v2oEALCIaL0QPWZ3gcCyY+FUmF8fWofSEqnHWhdrmbqvsitX+BGWte5o
+F0M5m1JIDIBu7JxEeB0t0ZNoeZnWBWsXTY50qUSZjLRSsgkiSNaaaEAOvu4TJe79
+B6xfv8zn2P98lnBEuuAH5GtFsAAf/7htchKbQ72ePGLjIow4BSAr2ZTIhaRnrd6v
+fKSZsL0lKp8rutUTYncm/EM6xB+fApf+BlDtsw2HWZqi14ADGM8pVOwq4rwhWWFd
+em9pGosy4fW8Oug0T+WIXmYx3TRh1o2U7kBDrKUqZu6Gm57YFAAARPjgeg0Pu5+P
+JEtRinhfm57s6YieefzBY/rha48sWk5jbXFKqbOCNInE9rerWnpscvSVaIhGQZYW
+Za3FGhjAHU5ZEDVHT+du5X+aKqj2NZmi+5G/DBg2322d0++exyRHIU//6QARAQAB
+tCZGZWRvcmEgKDEzKSA8ZmVkb3JhQGZlZG9yYXByb2plY3Qub3JnPokCNgQTAQIA
+IAUCS1Y83AIbDwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEH7catbo5A/egacP
+/1rDtOD5YhVhxJr2rcVyMF0yFERtRVP+nb4vb5HGxms6C4nI8b0jYwLe/OAkdS5g
+xdw+MVKVx1RcnN83N5YBwcCJiNiaN/SXUb+SbIWNCbfZq0s7jm9OWtZLE+WRkY8F
+NKfogR+rd27YfkdI+Y/5at4e9J0c6HyiczNMfUaahZhl+XeodZwaGdjhNpiKD/LC
+V/Ouhq46HUEuos5bHtk2Pz+1EUhsCuih/eeIHU2bRtRGjYF9jGffs4O9b+G/QfI2
+42IDoNqVotyLndiJBiR67iUGG8NLYARi9sDeD+B7pQ1b+LptYq1ltn4/3gbngKza
+SqXFdcjx2SOjpRPOGRc/pPchoAOZS2dYr8aSVkwc6A0VRLb8FGLaVkQa3o0eAq/N
+95wCE9XSFtGWIiCLjsygrTaXjOKdLzOAhaShk4KOdD2phHQ+cwz/Z9fDvtAozPvQ
+o36uB0d6Y1mdDjCmtfNfYTumL1z40/evLOlLXadQjY/+GoidBh+BotSCAeQLAMMH
++yDaTBFhUIER76OVfpMTja2D2s5YmcD01LhLF4Q3DsfNCSiwe8vhiN1KzyVnrwJi
+T6HwcX68lc0zXhIOADUohs950Drm3btOJP0vZTc0KT8Bvxy/ru+vkdFoqUL3Cw54
+g9fxqLowt3WXdBXuTdM9wlrBXXrSLpGFuuiv4Yzo2u3Q
+=0lqj
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-13-secondary b/RPM-GPG-KEY-fedora-13-secondary
new file mode 100644
index 0000000..0b6b8c0
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-13-secondary
@@ -0,0 +1,62 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+mQINBEueoh4BEACrnAsaYtEkk+H8psthbEhWboMQS3eIcTv6FUPs8/bjEg0b+JrX
++a7RAFhvzyDIA/2VqlIwxNF/dLFiLSoSAPF5ei4uZL940LXwxwOtr6VKRQrlb5o8
+6jMELrlsbT8mJKQZ2ouU9emVDDX4oj6o4qfDVeh2xoPbFJbgpEJjnFMKLwoFbGra
+yHtHccQZYpwc36eJ37jfkzj5Qz6ExPsyNc8QOXPvbh7o7CphjE+R0wslbimvU9Bt
+nb2mni7vJuyfQBwebhuAz+fRFZqXQUBUcB7vJiIW0ZombOGYpTO93ACEvmgOC8J7
++GstIE+3smSoSBhw9NpKvfFvzfVUIrWMxUaoWbfOAbZ9yiuiS/gjjJPGF64uTF4a
+6bu2SuQ5zNa2in46j3yh2z/rNoIbaFnFYFYTF00Y/b0GExvnkhaUvxG1d1iaiTtz
+EfeuphPqR1X+FaVQC0WzUEd54fPOfP3qJDS2cYmaPiQvsTPIF7YlyYpyEd9QY0jZ
+OGOkJMwMLrXxgeHolBfvwiGkrXvg2p27KxTE8BROPBBgxenJeAvlILuNLY255RvZ
+EbcF5ZlIjw1UMLkVfHIPe3KBIskixjQX0KxxqLF9i6DcrSSF69GAqRfzW7n6LROD
+l9F6XB5gPLLZmmdDf6397jzJ8vPG0SjmsxSoDhvbEgL28idknBCNdTs3swARAQAB
+tCxGZWRvcmEtU1BBUkMgKDEzKSA8ZmVkb3JhQGZlZG9yYXByb2plY3Qub3JnPokC
+NgQTAQIAIAUCS56iHgIbDwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEFbvJx1b
+9xteCYIP/jw37MLaqQLAJhA/4RdgYOU0ZQbwS6VNHh+iD34XXjxgxZfxW2XTpDST
+I6+gWWsQ4do/i2Y8TvYrKsyfPoK9wzbSY+8eW58kHH+/sQhpPaXHd3RMIOHjAKt1
+7zbjPs5mnmyna2ad6q2T/mDougR5CxgwFYZiqc4w2XNuPtlG4pOpAci+PMX5t97v
+sMZZRGHEyOD9G0glJ/6O8ZNR+iTFbqA54SZLA/rAl7JWV5m7XiJJZgYzwO3k6eq3
+QlPO34N8guQC2J2Rlo49jYJaAdagNTfqX4VQvuSEOAQiaoN1f/cjLF38c0FAQxOg
+vYnmT8AiXQMY5FDZZTSLskigvaQYbpu+d/odqx3W9j6KfM3DS8Q4nvlQgcgYjPiP
+AHBW0DcUN+UzqrO8rHEVgT+3wai7sNKHwyFeAcGjBI0E5eGz3kGviRNpqMnOnUZu
+d0mn2pO2Rc2fbAiPI00aBCSZyhBVqtzYhTGaAFRZ+TJ1DESkOV3zLlDsiXldQfev
+/MEB5oMOoXAqF1R+soMIai9wrXYyBSVcRjZV14IqhuFJB0VTdVitT4KFNjU6Vcxk
+HbNrrpqcRZEJgoIJ8wppJn/wUnan5Mf5ulEC30Nkm26PWNXpivIAw1vp0+kPJBk/
+UnTzBokxGYgA0ZcyUbcL2K1HDwADA83SvblPuiRzR917qtNiP7bJuQQNBEueoncQ
+EACma3CQbShhbEDXZYSGvWLc7MTGu6XRN5dz+bRtpW4TXI30XNMUXsH3cdI7yllG
+IGHDEOtHI53/o4t5lWj5GV589fpLQFJPlSJCmVNGjSlUEWnbD0mye2GhIuRvM2ej
+U3O4aoTQYGwBls2ojtNviYh90bgRQI06jVgJ7xnkT9GkcfUwzs/tCq+5B4b5HopI
+OKh8yjZfxivpx/uoompMvW/rRMoK31yDTA7hLO6U32vzubr0/gDdrdycniWQuFdH
+l5DOEuxcVlyvkW5zD+reGAkD1/wOYkUwVmY58fSE7WJUWW5X5BCLVCba+oKwoWqU
+PxnVE/0WQn+5dKVYy5DJaEI2yMdKK9vm7LO0Tm7lgv5ZJm+WW3vAmpON6Y9KKEUG
+yQuK9y6BQ/OikXber/peL0h1Nwz3U7AVJnNL1EYHgvIJ4DA3danRXr3o3H5LmOaF
+/f82+PgYediGQ5AtSDYXRpqtjabvRfX2W2XsLN4U0Y8Bq9YUASmAdETWirhg74Gr
+GqotFiJnYX9molC38AaWxiAKD3YOOaDyx5JJYLkgFJO7lP2NE//bR0NkKlD/nkax
+lrY9OGvix/L9rNh6ZR0uU/KaykRgR8j9rf1nGPEp8ZgCHSOksOy3WffEn9WCxbHY
+1Wk72CHB3AIkez5Bw/r9Dbfen8XSLTSlzo4vQTFFLfjxQwADBQ//VcMndQ5aJbNE
+gB1dRRQxSFHX94Mk2rNF5UL3HS/xZiB/3ijhHU5i43w5qPZexE11SuNKCCfKtd4J
+QZPqp1Tw4Iud1z/GvPfoBeSX5MuPBS6W47hM0+Cw5vcKAn5/ljy7VZbkg+KpKH7r
+RU1CuxOdTinA2hUIKwdyTLgLfRun5v7i9taBvDer4TiWyMC5X4iKPez4LiKlJxeM
+GHshExbaeXVIaPrCzV2dZ5jBnJp4qMhVm8T7XwKPWN4hJ2iQ3n9TvUJGjdAJZy4t
+ug4mKFmHH2boPd+ZokFd/J5WvXk1TpdxNMM64JNBEPX2mBQmDe3c5hSf8erjYdkM
+c4uJfw19BpG8YP23iIYcR7uFNXygBJyXipdsJ2KP2uymlwaRkhSZM3XtYXWgGwPb
+VCre01KUpjCSMBeIfTRxLnGM7xME3mJ49YLQpyJYlAZ8iXL5rD6gjBfgXH9I/0cG
+AaiJHa8jFSHpU265Dv8IKi/H+foyXtsLwr233t+r1OisQmGM3tmc2hjjfaoCX2Kj
+dJmj+B5dFtsjSpDYTm9+I27pyATGL9Om8WaTsHDn5OM4SGm92YsxyxUH8F/oS460
+Wkd09cnfYg/11LMqSJVn8016YuRBAXJYzjWHJ7FbGqnr6CcTDK3N4FOLQPwqOgJB
+kBwkls5S+UsKXJceSr7ZZv67nhIC5KKJAh8EGAECAAkFAkueoncCGwwACgkQVu8n
+HVv3G16VRA//aJV71S0j16XxzvKxqr/AxCVF6/zuo+WIg4h2oUl5HRE9qSSp8Dza
+Q8wf5P8neI61CLVuadjiO2Dx4csvE9fMvkAXskLoAPEra1FOjOvyTK8JPRxkYVTY
+XX5BsmupdJVcUA4SiB0igqJFBBWms4aJzAXTGWnkHsdiGUffTWrSw94BGkQdzztn
+5pt6JIo62daZpjiKgBCHczY+Bf7iGR5CFyfMm7X2WFgB72oVfyFA6nJH0upNMpgJ
+Ax7upGYcsmxsrrvxCoa/Ln3wxbZHJbn37fgGApLj3IOBmuJcOCaoRfWQpKt/fjLM
+tk8e4hIpt+EUBUxDcJSJsiJW9uQeOKjn59GgdXhY4NRBohCT6qxI9wXCadAeMZKE
+F1FIMcTYhVTDgJwP2DpuVtHH+3OiQmYVyx++HgdnNGRqysnsoRRM75fH31l2db2m
+5iaayD7ESp8aRuMVF5XUfR0RQzyj5YgrR6FtS79Klc8D0qSME9ga2bHPlMMP9rm7
+1fGuXdapuVbJYq5N25052QwE4r0EkxXaTCAdmRg6Qn20gQVb68xkkRZpfXPUgmUd
+LZNAZDNVX4QhUw6rMQGl8bDOSZvMez+sBuk7ER0F6ZPnrHAzD0x6A4pZNuG8XX6q
+OBrEITj9WCQTEREW1d7ZJtPJS1GIn8XMxH9i00SqxSEeSNngIVuMyaM=
+=s6m/
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-14-primary b/RPM-GPG-KEY-fedora-14-primary
new file mode 100644
index 0000000..ecebb44
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-14-primary
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+mQINBExJ1v4BEACnj/1xlkAkz2/1a6fOS4/WFHui2yWzE3deHAAkPpLnOqR487xd
+kulaGM982Np1HnZ2xDhP7cKOumI7P0dwzHW2KVMEzyYbivvJyP/XrLtc2tfzuA3+
+tJRSwIH4YTkCFkRb/aj81+HTI0olulq0WHx9tBTxOSA4PvdRGDHetkpT4loNGQoB
+2SWul2BLDxKmv0HP9CDa83AOt0UG00ecWQkJM2PYqR6wLfcOIKAZ8EGnJfQnj8iD
+1BzH2hsP08tD4NKbSPchcRlTqTtohHQIE2aT3LvzyJ/TTeK8x05YlPXQN3a1A2t1
+jEppn/7uoWdJCUjZpVzS1VcTJvK2uPjMHlUsmtl5o36NoGxKSlZDoNdqxcOVjTWA
+C9fHVqcEBTeehGMi6nLtMopYVbmYfZT8XCkHPg1/oecDffnRNCMi4AGJBRAt9+py
+oE9wy5G6dOQSFfynAIdioDF5oY+yUtHjPs036+InXHh1YnHIU1LhJdlZUlowmhqT
+mTSmHjD9f9+qMh+yfmdGMxhA0dxyJg/NYvZdp3p3pq3apps5jgm3m9WGpBmGkhLN
+hjrcTgw6INFs5iAuLxV2fRQ4NMoBO8yhSOTgXBlUwLW9G5MJxzxMea/mgEV4fGr7
+oteg/h/d8qVelV+Zh46EFEwEWbeHNiiM0HRIEdd0U5tYmk9h56COGowKuQARAQAB
+tCZGZWRvcmEgKDE0KSA8ZmVkb3JhQGZlZG9yYXByb2plY3Qub3JnPokCNgQTAQIA
+IAUCTEnW/gIbDwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEEIcrduXoQcfhfEP
+/jbcG3dgeSZ2CO4gzulkAQZVMMKKMHSOtoNMfKIi2ib7h6A2W3hA2JLfPlDUObvX
+cmZ4XVIXmBr7sxgWwf4W53S9S3OKgBseI0F/nnZYS/iKEgCg9GRzUOi9j9l0rviR
+yn3OmHCSr6R8ZAqCAnQBeGSP/rzdtaMf/HCxuOX0MsZASpmhQHxXDUJdhNT7aTUU
+JC4fOvCRYaRocZBQf8yexQnCPeoL65YusSq0D8+2Cg+HUX72vckAH3BoYYIsQZ6h
+/nPGHMru2nafF2deL0omTbtjJW5OUczJcEY/15MPrD55jyuZLnWwAQzjz0uMcaVi
+h9zwzy1EGB06OxpwKDipH7wjohIFKgJ1TSakiEVU14CzqJ2afvS8tVPDxIsuXgr+
+UvBmvatvRslyfdySQoHf8fqJiSYHpWhjw4S1+VU5NBSk1oTPqHobcEKTDXb9DdLI
+XMUpkOm+O6kVZ0VX9fFbJbaKlq/fT2bG6HzM8icDt3lnwm9eAPztr6f2nUfy/mqK
+iKYWPmRIiU14zc50vjVdDxx80DNZHUE/chz0WBeUSLzw8NQpY26o02LrPee2bQ88
+gwMcKde0lzJbwfND0JR58+tVEJIglxWn5I9JmYdJ9DYJIJlqXJv2CmDqVXUEMlez
+NRAnpOmXzGuNYYlBj3ZI+Zyk18AuA29xhWWud2zlw3a0
+=Zk4V
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-14-secondary b/RPM-GPG-KEY-fedora-14-secondary
new file mode 100644
index 0000000..f5a0bc3
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-14-secondary
@@ -0,0 +1,62 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+mQINBE53jtIBEADL4valF5TiSG9G4Lwz4dq8nGQH6XLcSB7Jd9LVmm419+0Ebuua
+QmwNwl4nGW5/gDbCklYfLfDBhZvK6ATerWIaLvgyYussoCMPrbrPl+xVXS48VCaa
+tsverHGGWV9B4c/FxsYFT9dofIFkxcK8XQkv9BRoHTw4vACbg19Ifk/BYvDjq6ef
+EmW2CfIqg2ir1U0FkrNombwrjPhGcG5HCu3bmxVB5pJMV4PWfDC0mD6OZxscjEoU
+ftwZvOlfTiRybH71EzLZ6Z/Kn2nyJDn9R8A8GdgYD4t5PdZne8mUwg0n9FF6FahU
+gRFCbamUqVT8TTYw7nCNqLXtlzxDQTjOItwCucFYUIfXuHEefMJs2s/XWdUF1dFb
+bvB+oluCA4ll6prLbZR4VubzVtQvZfj74aO1FhUeRLuQtEPH3PZz5SGYVpGqLZl7
+YudM2TFki/qVK65/fmGiUEjIYtaHCgjptnmLYy1StXByGZBmSLYEe4OUEiwMkUY1
+jUg9pqnqakF9Bm9a2HSAWwonWdRjIGJkR7A3Of9xJb09nQdTxXuFvcDMyNc49jml
+hIzic6923JPBBDMUpvv5pIKtsglFXne/8CYwsDo72dG0DYzbWVfEJjvBtxuMnr5n
+S6ei3lys5ZkhVbLjjE1ooYO4xGFlAxiA9jTowhw4Us4b2ZiaUNJlBcu6cQARAQAB
+tDBGZWRvcmEgU2Vjb25kYXJ5ICgxNCkgPGZlZG9yYUBmZWRvcmFwcm9qZWN0Lm9y
+Zz6JAjgEEwECACIFAk53jtICGw8GCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJ
+EJQT19kZvgv5uO8QAKYN0A65PtgEax+nyY1rBRwyZXcTrKPwr3xYybhdNTsuA5zi
+wG2ixZrVRnQ9nfGQCO1EonS3ZcaTeqS819aOs/Qj89NyMvO4fA4arQiWh2JrKG2D
+r7/gTsMVtaV1Ze+ZdthHEIulAUhXAot+bITZbR0mAxL7pU+Ngv1Y0LxwMDapk0FN
++nPIMdf/M35gaKx9OGdfYbX0HP3/dwxPZMgryieKHCcrdPevmCoFoZW6Xnt/s4A4
+O6Rih+iR84EEtMIQ+w97cyrwCfcp8u4h4rMjH/+x9Kd8ddgLzV6MolrkBWQTEMlP
+5hW4Ko2i/ineD1QLfSlazNfx0J+MyPfJ/8kGiFR6uXjWv5sWwBeE7UnyNGXP7Jix
+uckF+s6FAo150Ac8/3iClChtljrdoXROIU2U2CgcVlL67sJoXfafbYI+UIdavoBA
+sIAQX3l4wbPkHQxwwr8gTivEw5/wI16Jx54GXgix7eh5u8MoqrsRes/fzaRzqDrC
+RzeU/o8MQY9CtjOtASP8Sq75/T38YvAIXZarshRUhBQkizi9Aq2bh/CO/EAimezy
+4ICzlb0WnYDjIdVmSn9/XNx2AA+YOKM9HS4nTv1ItoIHOIy3u4dPqgZgklgMuePO
+KB34TaeM3mB6BxkClOld5+/LJ0/wdaLJXirpt2VtIBBCT1tEv+ijEeMyoEawuQQN
+BE53jtIQEAC56PUIMz0/j6C8uAM1pMNZcTCVVeE5Z+ndKUhLNnHehu6na4wDnhG1
+YPAwKUMpgeLa3QNcuRdrpUTDWKqsC/7wHTGW2aeCgR/FZIk1xpVE9QlasIe/BabN
+k7g8GZdcQha+RhiSwl/e1P+pNfYJGS2uOrWSjRxjSawGv//ihmnveoWBRa3Nd5x7
+hVYaO184V4KK2rZL9N1Vu+UWvDSe5EJSFIKuZZT3PNRccZ1O/68n55HrnFuj9zg6
+ji1VQMvP6tDpzau1bTbWb0qB8fbLgXFA/9JivyfTti+jiEGBLwU7knHhpJMO/VEz
+NexuBKNCKMwvoIg3VUHkDD3qU2qdlTSoWkp51+uPDWo5lhy40Bedyz6/CyU2QCMN
+nw4tO0AK+xwBue423nAnLhbScPDSkl+HpNNx1i9Wm0pSdQPvUd8jzQC8EiqpCuQZ
+azH13eiPpLE/+gK+jxaXwnViCF9u9U2AuLjO3DbE96Wj3r8PStRVdgm5mK8jLNKm
+tIZa3CDdRvU1Qi9eStS21K0sd78LCEqlgeBwnpfJtJG+6pkoHKiCPEmAdk+QUbiH
+iepgm+4B5nD3Ql47aqd8i6eWDiIuYuPrcmPZtYty3gojF+TncJ2Pi6xr2vKgTWs2
+aRHpjoyqgoJc8QIzkF0NjKtzLPL2IWYF3Kllq6DleXpys6vkwsVuOwADBRAAi/yW
+/uLm4tcIbGVIEOCAN+uad/V1XWbXr0faR+Lti/dSMK8fnU57jUn/pnRz9fJrMlk/
+PH+x3/NxpRWPxeV9VRMmj4yowKHM9Nb3jUdgHjNRc87dU/T1qSu2dU93iTiiztsT
+WmCv5mdscfAoJfgwAvuGyhStzV/0HckASo9B9nDl+muAnAawnDaFXfaSenzhNWGK
+8jOiscjXg2r0YDMOWGF7WiF+ZXh0Y2H1pL9xj7sRhHdC6jpd3cUfM3YQ5+I/sI85
+9y9zyT3DZWT1qLne7pT/4NOzBwKEi6VN/ZiHeHDiVswEGLNrx+FgcrzGAwZJRcdF
+cUBvmbjh1UzAri+AjMf2KZsdEqhIlob+W8iS4FTfqWfoP6aKwGXihh9QcdboxL40
+dR/GNxoi65C3w3J9A+vilKiTePo2r9Pun70ByJykDhS6UTh3oWWgyb0mM7LPlQiK
+Vc0cqAfZ32fVSffuNM9xLcCxvWDdDFtuhWJ7vYWBeUZi2RPtonjqO0tgbjKyZOsw
+R1/0Zy5vg6gO5x4QLboyVbGbgYRizFEppsdFw/0+5JbIcJDwM1cg0x/W5gdQFZuJ
+v1Bt07YZENS85hw79UoDszacWLpMiBFCe2pIyAOz/q8MwVldxugYN+HdRlwc9cwg
+HpDXs43wDF5gLbRPXRBJIMnJoCN3q8wGX8TBEYuJAh8EGAECAAkFAk53jtICGwwA
+CgkQlBPX2Rm+C/k5Tg//coNqTOpwP9LhsR0s5mF5WVxYR0ozKubrSK9GFyAwQVp3
+ymMvDZCzffFIB9vETezUOU51kdyycYYKkzNFj7EpR/EwUrv4tGE8dxb265Bd0fRs
+NMK35ZKtWA0IgDn9zPBgWxGYgfuxDNkN2EETPiqmuCZ+Yb8xIegFMo6FW40PkBr4
+R3hv8YDw0kEONMMostx2AK35b5HkscwSip8I5gvhTPXPfxtZJ2GbODwqqkvartmB
+XcbHFhBui2G4gRbnR09Vhu92nQa+kt5ypE6lhCfIjKYbryVBZKzTYShFI+G2CVPB
+O6oKi5m4Ojp/cJdyhPnzh0l33H/PGJ///9qcfWug87yMzHaVNYw4VgjVXdd2BoDn
+OczGiWK96nnk6MbtkF0czlGw1GayiD11O2rjays/BAn1nisMzSvNBdpjAHsYQQYW
+wDHV0SjKHxyvv/AD1RFzhYveJd06R5Lg36mEbMWj+pPF19HD3dA4DF6snEU0ErDt
+cOzM6biJjTiKSYkpD0ZYfZy3JLdAlcgl0wT1JNmNokV4/dnHVJFh0y16sMnHvNGb
+Oh1QPX+b09zsMSbbkXgqPvm4jXLxQB8PQzBYa5ywYjFmFLDxh+prZpJK7/lP/xQk
+HwpvsgimonSC9a/B8rCihnFIJWBuMKrLazMdtnr12ysArJqvdsSTqGW3aYHefpk=
+=1fI0
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-15-primary b/RPM-GPG-KEY-fedora-15-primary
new file mode 100644
index 0000000..fa4146a
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-15-primary
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+mQINBE1QZ78BEACdoNoYP9uIvFBJJ4Tg5Vn2gSFRDuKbj0qkifBdGT8co5Lfdgg2
+UnCximfJUxkul82RBu75AJ/VU6vgDvgnP4m5vhY+f/vV1scMeZbKzlJuW9YAIHqe
+CK2W1zEVfx4OqxdGJpFWiE4q0M74FDRkYMSQzb3FQWpVI2enmJCvGTMSx3cwhus0
+ck0H16sOGflcNeQVeZ/fiUzQ65WOIn7NWwc/ZQyNxLE3JMAY4Z805c2GgpnP4orC
+9YLH+fL7D+axL/Pd5cX6B0dy7mvVzBOPA0LL4qdvkss7vLCYlwR6urTgGAZHX4AW
+myJg16Bq6JOrvtQ1TxEChQYYkVOmPXcpC5xBiZzA9TqHVHfXrjnfWjpsA2N1TH8y
+VqkjOq40TDEwuSDDzX3f1xX9TaajmVwmKz9wTeBSw/UeLVMbiWhLzmHtD7UYKgdH
+X9HxN2v6mOErrEdBLjhD7hTfkwOtBO8Lgd5a5VnAcnBJ0PcEEISOOsLGJPkr3HQX
+Qxs4luSza8zq0/wnZc+cA6luDekj5JcuZvQAtej3xtQxI88MELNJfB5QvxwccwCC
+OKTpEcNzF9VwB3qhWleV6ZETF0Usi/M6yk2XsoKXUy0aGfPhV/nVQ8mokbbQTQkB
+cZ1jLSrbKqtrKOeZ8UvtJ1QGhrLtdw6CkTYk2oCxHPPSU+Naj536OpVFswARAQAB
+tCZGZWRvcmEgKDE1KSA8ZmVkb3JhQGZlZG9yYXByb2plY3Qub3JnPokCNgQTAQIA
+IAUCTVBnvwIbDwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJELTr9XkGnIRghwAP
+/RIIxLdPOr2dxQRRJ0Kd7pM2sDZaCuiplBGUU1Aslsjv5L1m4HjA1JwT/NDs2AvP
+1B97rV7n9UDzudH5pnhUHLJeAd4Oxw2ngoNN6IA/6UHFw+MDjUCz2x16iQi0IpCX
+o3lmIm9+ZM9761wvvzZWPEvZsUVVfaIWdML/FPagNi/JwICo2k7yyRPZUEOfmfsz
+bRO8YTWP6Cz0YJ5QGO6MZbfCiRqkv11PAXmio39YchGHNXKmVsbzVSVz6CF3LU1o
+5Y34R9UCWXXTk9U+koSPaUyn/oxnFMhFjklUB8PaFC67/Hr0wlP57xKMKdZkVR/O
+l+vgJPwk9ZirFfHuwanfCjGRNTcY9bNgCPXB6sOIp27IoN8kVarEqnvzgJQWQVZ+
+ACmu3oPEZ9Aaywe17fkGHzQaKOCBxl+rvfBEpd+Mck4C4qecRqyXS5Ftiop77mbG
+I1gGChBTG35YQUywZ+5DBYZ8PzWmYtPTTMelmaXcF1BYWFNgJuXpzkB2b70VMS4Q
+e0Jq/1iB57lfaQ1617YhlAP1LhgTJmv6HSXX+eXS4w+vYN0VxAtK2RI8WYk8UDw9
+W2g4vQYi29H1ldWHmIx3leiB+JKpCKcqpbeGmblQ0zwbBZUsm083PJM2bTlv3mVC
+RpNDMjs84DmneHRN9swSfC6fr8BeEXhS3tVCZriKoBfO
+=TOl+
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-15-secondary b/RPM-GPG-KEY-fedora-15-secondary
new file mode 100644
index 0000000..8bd2a4b
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-15-secondary
@@ -0,0 +1,62 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+mQINBE1QlXcBEADKAtnv9s4acf/wmyIWgv2HhuF07d95eX0klaLcKxQ5T+/TYWps
+rH/t8aOyX1m4yMXCIusseUiJgrwhcHkMthjEFTNNiK8dba3XtCtaiAcfLNun0VKc
+xdPQOEI3lSrJ+YfC+Veb5l0jdl5nDddYaWUgh/h6bMHMFDER9NT0BpRwGtuYombt
+XkQTZ0bLo+HHtDLv3zDIpezhNS7l2cDIkRj9LYzSnoV4Y4g2LYnqr+u52Ng5gb6M
+21/kgg04LWDF273MNRS7lENNznyreAoFqMJJs+XBe595XgTBkHKmdCdyaFajx9e6
+JfRPZ8rBk5aSD2mYzKRP0U6c8eZBEMX4whaaTJk57TfA8W5umI2qMLBtoln54NoY
+6RaJJt8Alfa6lEDUHmTdPD21+2QiZOoZBTl6K0Xa1SMd5x61iD5+1RDSG6T5w+sN
+vNpi0xuT98NQ1dBWtcmnqWR/nkzpH2+CN5HZofG4RVvvb/LWYr13MvDkQZ+J0q7h
+KGpb8tx5iT44jR8NXdt8r1By4G/jWMvdS6BFkeVZdUDddJ3pQGorHxchnU3zhhE7
+8gPz6w6xvQdNb2t8FIaQUGEvwx7e8Cg36MkC13Fj7bg+UbCbf9vV/v3XGlP783vu
+EA8z8o9C5FII3MOZjIHnOtXROL1KVjECjPPiVGiMIyMFaM0kjvO6sxHQUQARAQAB
+tCxGZWRvcmEtU1BBUkMgKDE1KSA8ZmVkb3JhQGZlZG9yYXByb2plY3Qub3JnPokC
+NgQTAQIAIAUCTVCVdwIbDwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEOXZoFA6
+0x0LzMUQAK0zCu9fqUL29n/m+EVgLPZ1WS6NVHnJzhTe0ei+B4kTNIODxBWKr/+X
+oHJzeQ20jvEDz7uPGg/8UBd12yAsgQ61v22zQRKP5iai2agdnvbC6vlzjpkf52yc
+mkT6nW8hB0JPcdM3wFOcYG+j8uie19ygy13+aMVdWX+ltzV1Kq62tsjGizH0mJBR
+bV2gP3Ufcf6p1OuH4uiAt/6F+jDWxCkkQ5EVmYomxwFH8+Rm9pJb45NXYd5PxrwO
+KNC0osCDeCwFVO8tICxtCbue/VvPgEOVLZB+TH+shSPBCAP6spNHCyPUIy7UosTJ
+BJK0TZawjTi0NrS47Ih0HqVviSFlJdkiwlYAYMYM05YdVWUf6at3x3S8gIGfhFaT
+G7eFEMC0eMHC1igIG2e+F5aF/OLjnwwo2t+6NL9fuutA/mNBCJxLRqTzP6c034My
+l8ct9H/+VVHNJQhyvzdSCPFtqCS4+qyHb3pn76OPaeF8P9Y8jYJ9CjeWBMD6iGZP
+n0crEJm9QsZ94CJYmo09IsTxghdbBWAtpJVCgy6oceErAGr5bRfdg5ZF2e3MzeAI
+qW0hfT5t1HpSFOGyhD5N7cUXJ3Fw6xbfKzq8Hw4t+hzSvmPTzZdqk+CKnYTwhfyA
+HWp2ayp449JL7UmDfkiT9ZCPd6e6WubLzkP2IRzDoGYl8kPJozDcuQQNBE1QmVcQ
+EADO3F51ZENZiTbkm6aU22QaFNLS0H3aYQqu5DyA+6Dw+fNwuWCoSqpdBZ3ItR2r
+mnOmw1LzKBpKCai6MeQZPVpqgVyRs4N8Uwl4vPP4HOGMzdU7jVEC2soNjwPAbszZ
+Us8Q82kBP2Lr9gr1E2D11qZmilc7CkCXAYvUAG5Pc2D1GVUTftzW1UaFiaVB5l/s
+nmwnF2gFKFBTj/XBl+/xx062KWKUDAXySdpZ54dxSyOYUEIF0c6l/sLaattyFarB
+7cNSlLglvu4FMYx2W/8GKDuQpczog27F4v9whqKR1i8AUUQMH4mAxlZ61xGmJoZv
+Fx5Wtn1Bb00m7TTlpwkjW7I4HXEYZB/QpdUb4jgK9ZapAO6FYgWHiTOADAGZxnay
+7MHaa9YKVamY0xbHV+NQNPxAJx3DkB8W1jxfzb41IKkcxJaCFUrGSJE4yvjaWp3O
+BPpIiEparp7ckvLxo/9FajqwLvKdf98Fn5AbyzZEjXdyh7T81yu6XNwqz+1gRyEO
+aAWM1osyHIY2Rp9nkalSZqkD5/cD4kx4FT4OLVicKWXU+MMJvL4RvkatlWM6yDM8
+ZAUb2bL3ywx8gLYUbvH5UnjK4FmDBZzKPLWHBKG84Kxi6kyug1uTrjE2rcELxI4k
+enYqYpElIfomAuT+SuHY+pONoQ1EG5H4XoUwqW9EGQt6IwADBg/9EFWufNrW2Gjk
+lZU3k9GHsCC4wO7OTudU0cFuxU2JPZnI/55xIT46zL864vupET97xow/QtzbHBEn
+IeNyi1Dc/NRPoobec322HnXD110A/tA4nkYMp9gFUbEM/NIqAgM140zMxhukn68v
+7I0zJ+T/VKndZnOL7BSnX/V+uJNwjeQahMd0T02+nz2lG+xsIG5HHGN2ExniQhXa
+WkI5+MRbzfDaIInHMvRIR3YHwrEg6jU2/V5DSOIz39IhikjCyvSmO3/7tQD6f5Dg
+PhM4atbLKj2mC6PeukH+x1tOqIAZoXZqfHNY9RGTvvqDYRQPycICMbv10RzUzpP0
+W07vc9r0rDD34l+f4iHbOS0Xcg3V6xV8+TXLY4WltdeOiC3hfx90f+jNX5BZB1Gp
+WX1ks57Rv4bCcorZviL8h84xUaxMwgoU1VEA5izihk8M+8i0RtkcfL+81DTAudqR
+69oLfKns97oVNQdGQ7cqc6fGWOZ7hXBzRxHf4YauXTnxTu4TbLtkLCWShenWX1nA
+5tMQz1Pjyd+MLg1qeLbQw6gBeJ0b2LW1x+bfgotgEyAun35LXR4kxLpOlil4fA3J
+G1KpbXK3e4QszKNw1yKHTZIgAg8rSMJW8iwsR+gGPPTBk9HlA7nej/Dne+HNPl0u
+TgyEXMJ6DpSUDoE5RRkU54SZfEPAKqiJAh8EGAECAAkFAk1QmVcCGwwACgkQ5dmg
+UDrTHQtkGhAAvT4gI9v8iWqVUe54r1n5Qdt+CJ9OVTDIya3d94aoOj/9RClrTwWc
+uPn0HlNC4jtu4tWwqTb3iN/dR5K1DiW8ZCuGrapeNF9n9X8VJv3Ufi9bPLA0MsuK
+PH2YJidi1DrjkLCho5oWTvOi7aoTUoCcL3Y5OdaFleBAZGvKyEQ0GkIKJnpS7te5
+PLaHTA+2fR5YPfa7Cwz0/1eWk4JJkpM4w1Mwv7b1llCRBhfs7p7wu1TUjFtyW6on
+7DJQWNm+HDNVtWX8WKMqG1SdMUvwremn0PqfPCny6k20Y4FeqvJGCwz5RGx+j0ER
+mFL4noV0HojWyq+FuaJwOaSjW46RAWfIcrz3FdDBS+yTdwn+9UReYYI8P7E948hE
+doMQZSWRtZE3XrHFzdT2GhCvMfHkvqn0+wS/7/rjjPaNWbVywbpv961RSwWCEqPD
+HiDn03aMxxdKQ2lMdZwFWmCzwyNPDlWWViowf7+0MK6DbijgiauYh1MZJp7qcvDq
+MUHMHXFp7VtLzq7VBNFrAskQlehwRK3dk2Gw1+mQKZz72ztd7hgRJx/+kaqCN+XO
+XHkRm7vFUnpodwLWBF9kNKhLsJ9WRLtYte0/l4d1c0NhmpNDwfi8K9Dz5ESIrSvn
+jfiGZefgI4nXZAWLSSVTDiBewWx6jGKhc13bMQxHHGdVtvCUP4sTda4=
+=s63N
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-16-primary b/RPM-GPG-KEY-fedora-16-primary
new file mode 100644
index 0000000..5a7ee8a
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-16-primary
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+mQINBE4t9H0BEADKYcbvLVHkBat2JuxWgRsSdXawP0zOXe3WwwBwENWTQoyw0vId
+gwEaITRECvx94E6CqKYSh30hkAr4o0WVMsuTwW6mAcHI7kiLUES9mX7q9YpbWzIK
+gxf5LNU7+uV4fw3TYAdp6WIlwRBbBZ6KIAOdvA+2O+BWrIumLfKSxvfZ2NrFqb/o
+axxVBaq6QWp9yivhU8QqNk+4smcsheDv4UNZz57TQcBRxTmGbosu9vsCLstTQfhm
+DV9xISAfd2mjNO/zH48nAcbO2EKHlD78LFB63nbHFK6cvVboFURo+oExDdC//bEm
+myXmTAzTAr7diRu8+yP3py+XPrT8qrTjnvG24CyDWsv0i6bsS1S1PwX1iFzSrmQF
+5BJrrPeQPLfcLe/BKNV03glWRI1QZLqN2JXwSxB0MfmUu5N5Y2P5XIjHSQIy4aUr
+sGiFNDweghYC0YnYC04viHdOMaQlMFLqJU9JB01nelkAxOh9mCOCnlRnm71Rk0Hy
+vPjjA/aiHHaE/tTNOEPbxo0d/RRd0Tx5uYoYjVewWp6ingnmodnmJDIJgHF0csyh
+qyFmWCeTku5nTZeJyTds1/MmwMDcMHNJDbZnHw/7sbaS+OF/O9jo6eyJ7kcyu6XQ
+cZZkSdOoMs5ogr1UB1Y74Mo2E5USq+2s7NVMnOnGl9kJ/59xl7/qT7dliQARAQAB
+tCZGZWRvcmEgKDE2KSA8ZmVkb3JhQGZlZG9yYXByb2plY3Qub3JnPokCNgQTAQIA
+IAUCTi30fQIbDwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEAZ/ALaoK6S333UP
+/0+4x6bf+IbrOOATlmwt1hdF2A11ZJ/xTrG8exUmis64dajGP28nOs5L0NjQkpfi
+xU8xKlDyCtdlFzoEeUI3kxvab6NOB4B5qICojMeVHOxn8nfqyQS/yYLdrQqoHPR7
+r1jrqBfKxEYH6i88UclpG7kgMgq2uENsH8mUu2Tsq+kR0y3gGJ/w1hdU6klpNL/s
+tzQe/AtTcj+571XTPUDcbGHU6ZYWwJN7uVNuZ/AhxIlXUt9GAJd1FLm2/UC7xFlM
+UK3e3k41TgJz/QwLRtjgIzEXY9CNWLBlSfxJjx2Iq94S/C5a5DWDIM2ue6Ci84PO
+57P0LleC+sjIMGSCU3NgPz3pfbuz7rJDYkVkmX6Vs00mETNe85zE4BNS3bigQ2B1
+WALjTZEAeE8nsrE2hH51kXKV+Rm3f2aV9GXRK5Uuuavr3nyrIvUh4J1oR27RHz25
++JF37yX9iCGqspk/CHlx8UGrHqOe/5UbqiRXHmzIpR4L/zq1MHJWzESJkmlr67ub
+he2nC3vgL9Fb43qm6Q4aeHBUNF9jfwBGH5JdTShsrbcoeXnKvLI/poPcnpXODdWN
+Ck6WNtP2A3n2bp7PCtKlybWyI7O+FFfAO8P6DYTYs27na3L8/Trr1VFk/24vSnTk
+ZfBQafh2YuMdMhrVwfn7Ow7w2qm7y9yvxbA1nv/i+JST
+=UuYc
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-16-secondary b/RPM-GPG-KEY-fedora-16-secondary
new file mode 100644
index 0000000..7ef7685
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-16-secondary
@@ -0,0 +1,62 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+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
+=oefa
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-17-primary b/RPM-GPG-KEY-fedora-17-primary
new file mode 100644
index 0000000..1bb8711
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-17-primary
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+mQINBE8MkeIBEADfn8QtElquxUAVvS8th7UnVmfkExw7jC7SVy7dGlXo5rgxqETM
+AZorpDIvAtKX5VMr/lUfODB6sSymh0e6EdvYQfHrpImO05F7WBq2DhRW74j1DRNu
+8vohKPTsSZTEZo/mrUBDAAGtGOXcrsQxx4J2Ur73+r18ODd+v6O33YevlFmwmFYT
+uDcgdhxyxBdpJVES8MdxO349uP9bvrU+3KjpDDGHb/hMbY8az7lwLtBufRrAekhN
+5Cg7+zm+I+wVGzgzSw0yrIh4hdVts4RKZIrl2N3VeZcCY4IrNZFd2Do6HhIwA7l/
+/xpTEBTZ4BmnGP9iufUVa2h97/JmKy38rM88IovIcTSnYDG68k/NxUkC+dLriI4T
+BNc9kJLVo821x77WYViNXHscF8ujlf73HilfCnhEtNwViGO7x41guQrdv5k79UDf
+1CylSZ+76vKXziz6uNHzIagiViNOvYHOoEH8jDNnubqFTxYXUNks5l3/byllQ0XK
+Oj9RarmjsMS3udRB6RCiEnzDbPge2S9gmdmY8MA3QeZ3aWoZJqygDQ0WNUOjPZ0E
+80x+xbUyAK06/SCzs6bUx6GMXd5Iy5r3Gc+6LRt4WEG5r/vJEHPSj3qAoVqydsY0
+GjASPIQmYduCdi7Inf0w+2n+nJGPcK1k432xHD0z0kp1Q/xcOH/Tul3bcQARAQAB
+tCZGZWRvcmEgKDE3KSA8ZmVkb3JhQGZlZG9yYXByb2plY3Qub3JnPokCNgQTAQIA
+IAUCTwyR4gIbDwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEFDpTJkayjRlKxAQ
+AICtQT+j8Sum1J86yBwso1wuzK2sHOXbfC1LCdQw2u6QLfKSUsCnQ5AL+oCnS491
+5fjrYksT2siclLhgZX7/yF76XuYHHhRTO65NaPSCxxhN6S9zbExUPRoxFL1ay0cH
+p14WYI1/SGmKPcJmigV6n8+wGYl+zWlH9eiiFP/+JCxJ0ZvRg3mgT5zcPdIzTDOz
+4rTE3WfH3qqxYhw2ttDPomBSdbgJw2N6bj46t8rljIDGdeKpFHYMVXpUp0gDkEoY
+bAiQhvZaa2F6mGMfXRdr4Phs562+tF/Qy/JaK8uafYZPHTtC16NHf87DYceLzvci
+W1KNBYGrEHm5NMguBlqP348FYMp+6hJDYMl38Qx3BK9bz6lW0G75tgaAZ+sxAFGs
+/MUcjChkF9OcF7Y7W6hY3IQb/+FgB5eNpBqfmZZ76ywpS+D0sIqxzWoILtlXdHeN
+eM4YiX0gvVQXwn9S89O5vWKxWYspywfgV/aXHk14O6k7oi8wInJOvgxZKEHUT4XU
+K7DyogL45VV9iYoWYIym2L17VBnINE/Kwmc/81nYigE0tTOwaR+qMFBSRlkOA4+X
+ZlIvb5Cft7CdC183FYLIM+B6xNSKE/OhavHZsRJrLZC1aAP8MNh8Cy7Jqrn1/Qjj
+6sncrqaj/Yis4yAaINk4MrnbImN2MwzU70q0eR3kA6PY
+=3+4G
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-17-secondary b/RPM-GPG-KEY-fedora-17-secondary
new file mode 100644
index 0000000..9b43085
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-17-secondary
@@ -0,0 +1,63 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+mQINBE8LjU8BEACs8DbU9pRq7DXMGjbgdsplY5/kPu/yy/6NqnkraSWv7YqV1ER4
+cqRejtl7ubj/H6tgCLemy2Zy7O+ICLJhkVdybQT0lTk8OFevecntvpWlK8FQJ3BB
+FJTmY9Vvdpu2FW4+YMmW3V/e6ILo5V+Ok9AJsUbvzF9tE3qQQvNUBNzKIPWx7Pqv
+Rnvd4E2kkF/57xDY5TLOExZS6MIPvBQmQMUxr38X5UqNQKGvocSmVglheaQnUM+t
+iRCoM7LnL4EVUvqYUX/VvQwShRgti/vPEVD+ofDwXrvdY7vZkjlZPeTs2416R45o
+Zxr2XDUc1g45MI10RVLcjGXjN45ecUfCi7lbTq97dODxT53YdVSehS6WFZoyYCZN
+bJrhrcs5ThLqCm/t+ZPDvlypMPiIj59MK5xoToxh3LfxzTGVl+8HhKzuOzxvfDxH
+TYmIh6pofgeA5eGyQbvFcAxZR5m6P16Y/dR0W1V9GO8YS0VQrEgG2IQHW0wnPb0W
+PCOMAzc+KCrQQ9S1WqwVNHdzvxrk3roC/DrWPcO3GT0T/RTU1g3GNq+yfskma0Yj
+yj2a7M6+fl3m1BXeso2A3YvRY2uy52qCgoOgkndeQ6CTnvyhI15hcVuycXmeR486
+k4jVvTam7OzVJV0pvtKohK6aCwvo2keHRT4SmCPzQ6lWzVuOt+3KMY4NBwARAQAB
+tDVGZWRvcmEgU2Vjb25kYXJ5IEFyY2ggKDE3KSA8ZmVkb3JhQGZlZG9yYXByb2pl
+Y3Qub3JnPokCOAQTAQIAIgUCTwuNTwIbDwYLCQgHAwIGFQgCCQoLBBYCAwECHgEC
+F4AACgkQ7YX84/jfZ+bGDw/9HelPP9PLIXsD//cVYq9Nmm75/Xrtib3yUHYQ5T3k
+u6+wQphr16WHS0GYrWix63f2aSsPvkXor33vDBAwyUtEGOUfoIPoeaquPirGJYld
+qzFvx/SaqPjEcsm9In+Ns0jiScD15Rvu8hSn0UFcnTlAU8p+iCtl+iAfJdrOFCYi
+ZAZQfeowaIGvWW+ww80JxG/bIMwTB5NTRUZqghPVp10X7ZY6/4AjhNVZlsjZmB1Y
+MuxNUdNdkROZ1rc7BB7N61S/q1fEJJidpAzfLMVK5t5YnpSbzi8FH/piHL0BXYQx
+8JspyrBDjPjC3Z756MYSHPTHZLy61Ck2418Uv51kheyD7tADMWWRO3ALRzxw1kfU
+RMJ0Uuz1AFvFu3aZnxW4yzGiif7MFmLL9FeymuI2F8F90ZrqRuVBUun1lmFfSsK5
+Lh0exZNxdCqNLgJLjerae7qUA/60IG7tnlHyFJ3Bas64IZoZy1TH+g+cYG2FtJxe
+Bfzd6qTxqyZ4SJpdpAx1QJIh60NnSu24cUZhf0sBextPyhrYoLATaK1db9IX/tK+
+rrL+/pgVgthvrtxVCKF9IziMivJZe798NvVG1x92IAjzewxHzJXAVx8PB++iZMPA
+xNusCo2XmfJc1eaTwFwwH3Abg8T3FRf9TGNnPvlQE/W24/mxEkAYq6ZStp15UOqF
+2RK5BA0ETwuNTxAQAMiBV9BcRjx64+xJRTrST5Xhg2LDOfRY+PwGMRuvMXdMxNv/
+mfBY8h1bLxwVRjGltkzmbg+OZkGMOFYzpXHjW/KTxdBuC/jYrGDfcJwDTqRSqlKJ
+5+S4n8wjTPJVbAF7+4Foe0G918MUuwkWjXRCle7NtmqVHfnRmrje/6U1UAANV7Hi
+HyZK2uivYmR+R2aXnhFJWksGI8BwmlmODgZKSOJ+dkWtDPWTRpoggb9OAMhOoKTr
+hJAk8vnkTW+lOFyaMveoa1ATe6ArOo9eNU5b2m7Ga1k1A6/0K88biqAy0bnoQidf
+UPoLbS8klt/+hDjXKCzWdLj8m4xDVFd0m4liPlNsoMzIFAjwtxQcK5Z+vnI9gpkb
+s9LrTvVxku3wGBE+yJNXHGAuyWPWt6GJf2/Mg2qgu8IiiZs5LWO4znU6Nyx8Y+Dh
+uGtWpC9ahajeqoQFO5zF8FLD240LgIeOjUKzoc3PFb8R3X8k4gCSqPzDDcNoCr78
+KkruLrSAv5f8YrT/Hx1kY6Mug3pfi/vrs4tWJGKpQOerzt46Km+sLIKsvxH48YZ2
+gTxY8OxwVT2sU/zhmWT+anUqYs+FJ1+W8NvJRE4KU6G0TaNb3J2jPsytVrLqxWM4
+8vJpsOMGUdcLTDzI1memTHqDei3R9NXw6HBsrqGeZqmdU8y9s2XsGkQjqOkbAAMF
+D/4lCyiu2OAQVUhc6PV10gn7bCrgL9QrMVuY2aRjStw/z5n9/yrC8utJTr5YQose
+e4XUmZRsJIErsMsL7KNhC1YfYOEJ6mlEfzNjqoDSrGL+eM99mlbsyqvn1GG/4+aq
++NP0MM63KaY+hJU5YMlxyvculucO97CRGqBb7PsD9KGfemVjDZZeyIiCXztDPG7q
+q2ZbBQZxAVS0jI1qA01KElZiOyzkdXE+H2Bn3EGhhDKxg7Xpf8WyZAQlNygiSS+1
+sSwwRktRrqYOsE+f194WJ5Hn/I0NvhLa8RCDEV6HQXZo6cLcqhnq5hDsdBKuNhwd
+lzlKyUW6Ax/rEAU6tJed2oMXTG40nh8PU4DHdwYz/evmKx+m3Wp77oU4bWlmN0mh
+CLlPVrNIynRkaJiw4ytvTrBMddcHfywrgrS6zS5fx/XTdndtd8YGqfrZOrJTlTg3
+jvZs0eQi4O+4KOl/Wd+tWR7N4nv6h9ba/dnjGTMCSFj4tbtuN8yRwCb3c5uBncnx
+ZZxnOCTr0+ktV8AQ2av+OsOgjd2GkKX1YNTL6KufbTfLT1m+4nN/0pBZm4ivpd0E
+6AWRlHoDBzeGE2vOEJ0qtAlneXbRH0G8iRShoBquyenNLmqlO9T54iHQaFR8NDLl
+zFP31F4LOluoyU2ScaU8TsfesBPOuguirLMouh3mt0hd4IkCHwQYAQIACQUCTwuN
+TwIbDAAKCRDthfzj+N9n5nB3D/9YTku3rNX4jpAQXA9/TD+sd4dvJQr2GC3n+Qfk
+RwO0GCndWOiswF3s8RbGFJ18Anv+KxPRMvkvJCTQy2TtC9IXDStAjDxBci8BI+Gp
+Ir9eYczCyRsw/ZZBCMAElDtJnUaztX2DBkIrC5WlS/7IYs3MI4lakbrdWDk8UaHc
+GpuQHII1JCmJ5hZyRNgLTOFJ4E5GImImQm/Ub4VAQzuuJhvcv9/vQAhSoK6g2Jy/
+BPrvHpIhQrI5FVrcQR8v1s5Eb6nSXhV7uHBw/5w0JvBGMPcboVmuRq/HaSLtUEC1
+h8hn0PUqI2fw0bYA6RjMo4eLX4dIk3vf7XWYmQDpNoVb/Fn31kUyhksh6VUF1164
+U1wezyMs9DPIQ8F83kY9wzNIGv6r3vAUP/+ZGtypFsqZkMp10ej7S/A14ZsEYeo0
+DegcacD2lR/gf8ERyDbnDBfKdi5l6H1u7ak44hmkjV3Nr246hCsYxwhan2CkrHxV
+MhkxIXUGa1Q1clSUtQEoLQElPIs//dtTMhvDgELOJqX/vAkViY5IZs8pk5OFEFXx
+6K1IKIFjHTEKXU5K0cRqVixPRbO3/Fc0wkHWcF8GwogPZkJPmWD+I6VLdOW+b8F+
+JBqsQXQbtQ4iazcDXHdfwg5tI7Mv/S0aD9u6lubknAa1oDS5ro1QfYBKTZ+cnj+4
+inhEYw==
+=v9/k
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-18-primary b/RPM-GPG-KEY-fedora-18-primary
new file mode 100644
index 0000000..7f54bf8
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-18-primary
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+mQINBFAfSWQBEADCxcZGtV5xGYGOKIOlidZ1Kj9ymFNCk/3+HkK9dpRqFdoIpx7o
+ZqXFWFWktMeH5iUarCAzhIZlNJ6hsOXHQ6yPASsNR8XATCtaf2P+tz50Rvo6R2OK
+2/KRIrRjBL0GQNGlJ3QX+WLkZXYYuf47TNiESJ8ooMp52t2IV+PXc//cdHnBoS2i
+LOO/5PkhhnvOgANmj/YrO2OA9p8NC/LoMa0Oa0u+EmBO3dddRqobRKV1+fA725Ij
+TXP5C8K3xWKo+vhmFN/k2IrcETAy79Gtwj1leMqM4m8AG5XLdjv8wjziNtEyBDz6
+5MyYG8bMoVVpeTt8erWtSWOyeAxH8MeIkXbAmaTt/4actgTPm8/tvuB1cP1S4VW5
+fbBtV5G912xX6vz8WGc1SjnHaNzQJ1xBufxewkcesN1BdN+vqSE4UOR47h4E+R+3
+aN7chjYWRuz4zicBBVTv26Zti0REY7FP0EBa4goxf/zC0FQADQRhsqoZKcuATa6L
+2j930rp0jGHO0WPgQOMDdd/rzp/oJjhjZsChbj1ktzwfEE5gL7QnQ/mm12C1/2Gu
+tIRXVrMCxsyO47L39eqc+KfvnFXF3DuGEeaC8Iko3fF79FL7fREZ+GKWSzM/JKjk
+KLTHaew03qQi4EhX5cthRmDMfQ7MJA2sk64djvTvh5fJmyANEfDhw3i1mQARAQAB
+tCZGZWRvcmEgKDE4KSA8ZmVkb3JhQGZlZG9yYXByb2plY3Qub3JnPokCOAQTAQIA
+IgUCUB9JZAIbDwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ/wESXN5/OL2W
+7g/5AVNvfFwLFUcav+cj/gMscI9+rMbzwf8XY2TuXautacMhb2RP3B1taEFwzHvq
+THXLxVgO+wZDIPsZrdVEjRQLion6DxOp9EnhJUysSXHzfp0LFOQzfI5YvBkqpf7V
+ew8K6nM1+hTyLBQWKnxsAolaglB2YULoIYY6q7eJpza8Er9z4MWmyuY//SUT4t27
++8vmg00MNx1W1xoJlpF1L2T6rhiYmeYlYQn0KO0eEGBLdDZvWQjW7Kmpnt2Z/QzY
+smNLUuWxtwEXNbJ4lWehHMAocoQFJ2geFC3hOxyC2Ahfk3AlTdh0HYCrtr592Y07
+cMRqrSAM2+Z6sE/LuHUjYX3sQu1+/by9aTKqhajpgHq2DKYmW4x5+2PF75slU1Lr
+QiFyogXAU0poQjt2QWvo6jwNxSkbQpsQ1R4gkxb7TkI/fR4G8/txOIpwtepiFBGH
+ALqIMx+sMQEUMWZlArBf78Hf9JjV5J8g+eDbirWKYJvpb50IYnGNbS1IVUcF6k4G
+lcBV4UFMytptxYVOthxg0eMlprfhzC+kQJy1iockVjfjq/g/akFF1JfK/oOEVuuz
+ESZ1CDA18AAktEFEcefKcx9wLqmim9udirDjpMu3aH3HfCouwjX0Bhwf5kLgVyz1
+fsBILFvv9KXz10kfmgnEwhJ0ArFuHW5kk/LUEcHORdO41z4=
+=Xlbx
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-18-secondary b/RPM-GPG-KEY-fedora-18-secondary
new file mode 100644
index 0000000..c420742
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-18-secondary
@@ -0,0 +1,63 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+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
+JKvFJQ==
+=5CMk
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-19-primary b/RPM-GPG-KEY-fedora-19-primary
new file mode 100644
index 0000000..9787950
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-19-primary
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+mQINBFC5a/0BEAD3LjUH329eJjBCdQ60m5wG9U/QToy/sEsx6+q/012wXPMFBMCW
+1h53ISj1uEyHd++qMn71u/GtWnRTwvPaxUUqdNiFQpTMAmY41JIdXmOzUYj9u3h/
+dLQJT7wKbKHQrfDnapT2O3eIyYuj07iPTtaIrUE8AZ/wVmrJ0xnLDeir2FfC3h3V
+mqFo7OAK193FdufYYT5YQlY4jJrgwo7KDjLEh9ZrB42Fj4+MXgjeX3K+gel/GwiS
+b/KahgB9bywUcstvDWoXfbhHmf0fw3SmRY+5B0wWp1un7uepsE+JJ69G4gwfgcln
+49JrYBGFdMBuvX6e3Dw5hUZ+rRtUn911qIO9uPR+SCJqf4ttzs9U0VSdLDUfFAv+
+Isb4WOXF8UF0QbN/Cl+EMs9eiN+MNCvYWRDcnsGTeEmIDhABqwfkrOXNpMHm1FNa
+P98QVc9TpBojes3KwmkTolAW92lgznYbpeN9nsv4BLT+hnBJGIegsgq78E1fa557
+l+am+qerljlHWapVB+107qdNBNxeOAUA6DdXH9B6XZju1+M4kjYrtzKraUCUMZZ9
+JebOKMerF++fjdSqmJM8LbNIwcfDtqBqMBBrbiIhlysiFBIItBOK+KCOQ+s95had
+J/kFbo1doFUc+k4+ltMwsQGhRoWeSpr3Xl5ohGCnF9k9PwnlBzGx8I+xWwARAQAB
+tCZGZWRvcmEgKDE5KSA8ZmVkb3JhQGZlZG9yYXByb2plY3Qub3JnPokCOAQTAQIA
+IgUCULlr/QIbDwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQB0d+ZftLGOYR
+mA/+KAam9+c6wmJauLOY5dHMxd5UxsfPz3YsTKNLVDwt/ohRze4hXcH/Wt4bOfk8
+FSO35xzP4ynXpUZDfrDJsz4QNOpGTIyQCJdCHr8n+RR6IDMSVF9e8uOMoCfwE/Nw
+erLD4KGI6S1+bffcEA6YTxQod+4WMEJlkLToTfEBtxksxGMoW3xdwINDT13jQivm
+zktoGbOQE6zSSNVaaA94xSw5AbiYXUqfIvvJBmCPeM89ctTC5tTyNsQAN8n0QJtD
+lKT3hPfT8H4gacqiecXBJ6fpuWMXY4t044JBPmOk5Nlr0TEJ3m0jmPc1A6f+h+/Y
+flBLVIGx+Bw+LIrfxAfrn03XLyleDEO9kvC7q1zxnezKdcxtVXfI5bDQZELWMT1b
+KVQvje3KuEZ0IrRwV3qKKucBNqd0k2F6O0ovLMorenLMyBl9SDpOWt67roJeANiq
+BFFJkNuDqBtHgzgY7053Lj7VMoIeOtBpRf6WM7m8MaI0gXTgjZrhPPynqdFmDtvd
+6IqBYVFvUgIqPM36Scev2CMpok/g8KBzaHKljim+xSI4wziu3Kfxb854P/Df9WZd
+bCDWpFdPY5/dCnoMgTHGKLUumUMlfXif+fEykNt4Ic9Fibkzv+QSHQ5YYtoTfp9i
+o7puEJiQxkQsuX/CcXU9NDL6MeBBNS/b67EqnObAIRzroHY=
+=apZ8
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-19-secondary b/RPM-GPG-KEY-fedora-19-secondary
new file mode 100644
index 0000000..38963ed
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-19-secondary
@@ -0,0 +1,62 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+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
+=cM40
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-20-primary b/RPM-GPG-KEY-fedora-20-primary
new file mode 100644
index 0000000..96dae1d
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-20-primary
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+mQINBFGVT8oBEADiEFecKV2eDgaIoK6O/+2UxTGYHpVJYHj7Jl2EGHZWJ3jaN2xD
+slXrhgurZZaXl1Cb1vplFIrMtC4rUxyKWwGPRa3jo9MkSgpwqFsYnKsFxo9Vu/9Z
+XRAD6x4KfSl1J+c56qjKaBA3e873pcapBSWaw/gWCIxDQzhhiqYEdqFiu3PfbTvB
+YT1Zp3QqN5TW61Rs/Uq8WkoOLKhAnucuvrfqapAVN5Hc2JWeh32sLNLdXfo3XnWd
+VksqfXHnt9cr9I4ErsJ0KyBZFx36d7rQ3VoPKYDBtL8ZhwNkgJ6QVIZl1u33SPAF
+QbsetNtQhnN8Nx6ks6e5+mTOGz1HneD36wU1zeUxSFCFoD4W+bvUTpquTlDRRZXk
+GlkSqUBxxAD8vQm55+cVhrwaTRT80vJFYXNPx47zNih7xZVznwzzGCG3cWlKlhhO
+KZMXtmgW0KSi7ICb3KUU0e5njP3OBkeB7N2o9le2Qtf7t6LfJdwY13dS4c05olhe
+j7pEO+qVGBWgaC+plbiYCh1MQedb7dkjUPByTiHVpBUQH4aktLqLd/0Dt6fqxMh+
+MhxglZW7iVfTcfCqfQfNmyctD2t/fQzyfR9tYd5oIO5dep9Q2aIXlf4TJ3m392v3
+Dxz47P1L9l6kATflx1nj2tG1U6qP0ePlkDjDD9XIL9cKZ08UXaTiHYY/qQARAQAB
+tCZGZWRvcmEgKDIwKSA8ZmVkb3JhQGZlZG9yYXByb2plY3Qub3JnPokCOAQTAQIA
+IgUCUZVPygIbDwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQLrFh+iRhEMGm
+2Q//R1h9bBgdF4w9ZWM0ny5rx/DzXQCDP4CKMEhzvJXAPZuSDtWa+PkppGp4rq49
+1GwGRs3CGF3UikX6Mqr0TbZiGpXZ+5MaXlgU59ULtvHaRGKYK5lvoeLyOZpBB0vo
+yqBuCGnHPbHyJjilwMXp91LNdbRu3yHYNFgr/ZLQcJ/66UMnawX2Hb4fTcUPKb+X
+r57gmERlRBSTbAPSM8WfCtQh1GtxLJT7rW8ayeD8DFnNB3oaTKqOyH1p2Cxxv4qi
+xUCEx0k57TfCRcBzrb4CPG15phmLbCBFm+jdDNboi+LYIHAj9XU1znJm/lHLAHNI
+cF6/9UwObs0L2i/yWqVJaj0fQ4hhhz7l2SOnzZH7SPj2irNkxGNMHrDXNESNZgzR
+AnnteEMHv3UMJfDdn0llet7sP+7wVJEpBJaU+e1rZBvgM0KvQt53xKkCgLN8kVpn
+JtbJ8DXvlt7yeCIRfhHJFvhY7+hdZqSygzOSUPeUcr+0VKgBjByUWdbAQV13TKo4
+a4B+t7Fzj5UT9xKGqebv0CEnKI210ONg9Oj2NZU2PaPLTveiGe1BbEvazdNbd7Ts
+zasvA0Wp12xIyJpeJwe6TNNR9lLDkj9fhvLUH0o+6bPyHas4hrhcZsQa/trSyiiS
+XFz25bVz+AZ0b3aEcABLDCpG8nMOPiSSE6uccRAlW7muFOw=
+=EJ/7
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-20-secondary b/RPM-GPG-KEY-fedora-20-secondary
new file mode 100644
index 0000000..2b8ff4c
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-20-secondary
@@ -0,0 +1,62 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+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
+=iUW0
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-21-primary b/RPM-GPG-KEY-fedora-21-primary
new file mode 100644
index 0000000..81916a1
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-21-primary
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+mQINBFKEQVoBEADOb9mKZZtTIVRMMejO9dco+dsv6L2ZvnlidMVaudoD7pN9hl35
+xUZFwQxzATy2iCoFY92WU1zIKxCg9fa0gS9jGGl9rOI/1uQm+i/KxkzJCKW0CYpA
+QVNNYHewQa7JHuTYbaN+kWEBGG0RWJw6BN2NxR3zDkLT2tgcf0zBobeUMi6XwFg4
+jikJ/vi84MEX4Gky/OtVXuzk0fGnP7xYPYfBkfG5FbMj3UxbfAAn1Sr9PxIFdCxP
+c06h9kkO+gJPD7Cis1pNg9HWpssIEHIk0ZaL0sssMSpSsgP0f44UpKVCq0+JDJmM
+EEu2KfeV9r2dEiEude+Gg4U3rbUh2PTZpQKKwPyggQwk6nPHbrqrr9zBIH5iyYuU
+vdTVO7YrDqYK5o3WhqKYG19oNbtCziNuC9x8RLFkerr0amQjy1dZsofGYSLjZ8Er
+3PgtUMunH4Y7O6FbRljniqYoQl8GDMaxhptvrOY+NqRAQiRLzpT6BB3nZhO9iSk9
+Lvb9hwjMFsN5xh2wCxYV+XNjnMSO+LZisJimKhyMVhimcYK1P0sU49RcglmS2mhP
+OGb14pH+B94lMve/kQu4unnhKhtkPA0mOyeH8BGl63vvEbJtMzpMqbHvzr60h8PA
+H7EsAsYJZp4Xa+F1wBRBJ3xKaUTQ7r7mmpFsdgzlI2wjNgLbyEV4YSNVjwARAQAB
+tCZGZWRvcmEgKDIxKSA8ZmVkb3JhQGZlZG9yYXByb2plY3Qub3JnPokCOAQTAQIA
+IgUCUoRBWgIbDwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQia1Oh5WkP1S+
+rQ//V5WOPjl0UjEgRYsjwm6LGZe8/P4muXdKX1OuRF+MLZxW1Pbr43zjvfY9tZlD
+v4QpI5uECX5To9phrOXI8ghFpI4aQbRe2enk4dksgdhzdBW0JgM3JRf8F+tPLKEF
+kB2/tGqi/irp+Hij/tiHwUZjx8qKGbF0r2bxAkSS5qkmalTs6PwcWwEN4a6sKPgw
+iVGL2VRM46YoNDORwH7HYeODbJtyJyX3NvcluNKf/D3OZFaNYH+nUISlaPAbC5HJ
+sVmZD9vm2E2ypErbZzrY3N8PRgHuIrDmO+LmksWteofpWZO84lyuvgYgXPy8Q3Ls
++p0zfE5zv8EbX4WG+l1SF7hVdPC7UEPUuHmlm81Fi69tSvwO+N4PrDU094VHT+UQ
+rKmtSGDOfSx6FvrEqMakiEyBgKNwhsVJbi6/LXHMBImbSN3tOxSMBxGEi2cSn/KF
+LRukmMoEw4PHZK+gPpwsP1cTfxezs/aH/PMBaPUgg1qCu9uNNFmEs3d5LLSee9RM
+U+gwECX+D44vqJUAT7xM1A4yij3rPF2RegOmNhu5wg4zNSGKoVV8QsMOKrjIZHmG
+pFVvYFP4OxLEwh6OYZj9qfaw445ryqfcxSNzZ3m+VSwHuZ049v7u8fndZ8TREVXx
+hdjPHxjtaiJ1R0Zb4ZvycUcDLl2Xc1CRJAMVvFJcg1SNrGs=
+=xtMc
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-21-secondary b/RPM-GPG-KEY-fedora-21-secondary
new file mode 100644
index 0000000..6c21496
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-21-secondary
@@ -0,0 +1,62 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+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
+=/oDi
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-22-primary b/RPM-GPG-KEY-fedora-22-primary
new file mode 100644
index 0000000..52eeeca
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-22-primary
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+mQINBFO8uscBEADWHjOQeufsWIPFwX/43vHXQb95U39CS2o/uw56hp+M87RWxTfY
+b+FtjYdQ4vKCEvrgdGCLFrW74YkdaTVKd/3C0aQolEzhrgrHOCyPw3DxC2dwnHMe
+8z9uVxDTmitzCtIAR2eqeanNZIQzYDwcgzmXoxF2n/nZHQB2iPQj/QCXYVClddRk
++8MXC3YHtfGUmWeXl3840mSxMo6F48KNhzg0OzissHgU0xyfCWUYr1HYc4Q8aEVc
+2N99ahxTPdWc7KmoYbHHlIlP13zCixkxelKcb7+phJ0k0jn0lVaKigN3UjKRt3C/
+WeLnOvdpQZIk0NP1mZ1wqNfiEW3lyymogr1qZTUUviG6xKXa4swaKKb2sSEddENJ
+5S0YjFzT1l5jih3aLxQepn/HQ0AHHwAVPWDy2RaRh9pOtUbvF5kQTElV0YjGPaVc
+JyGjkTCUPBjfvUG+bh6pvznQ1z85s0JssP0j3a20EzcYahnMhM7l+VSw0OP0O2dX
+NWlIjfilaujvNybXY2r3FXopbH46RMuoOlADTZo6iLgKq64hLKpGIAn5koxTSs8R
+1akOa4FlPqY+PMhGKHYQPXxQIr4wtrMNJ+Vp4hdKz1SWkoTWsKgycWDW+7Oswwph
+VCDd0PWy2RpFeTZtXu8QUvxL3ZKCd9T8UNhqZ8TQfSKvuncgE/tQhMXgzQARAQAB
+tCZGZWRvcmEgKDIyKSA8ZmVkb3JhQGZlZG9yYXByb2plY3Qub3JnPokCOAQTAQIA
+IgUCU7y6xwIbDwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQEa3AlI4UMdUu
+pBAA1FVUUGWxOxF1MsFjgz7c7fx7rKg8Uj8ep+pVAo8klqGE8TPIRlWiuL/JEbPJ
+Y3Aiv6agGVhCG8UrTzoei/aLbDA4WAUgHRANAbgqLd+HldA6dGXDJPBnci9Aze2X
+w2luyWPNUa5SHAETy80XHjvXagjZApPWlTePpZB7aKsrc2arpuPxUVWlGKavja6a
+2SY5aO4vqnB3rx3q6dfymcZ36TUcOc1H3yKpZ2keRxez6lLVi/DXDZU+D8q2Irjg
+4gfqXvqVnoof27MawCA6bqNIHAz5f167BQjXqDtlNcIpO7cDEDuQTHQa4dNFxhto
+9Rd3czWFIBTJkoGFeuYMLqAK+VbG2lhLmLs9sDf3gF5smlkadmzCz2VIIlLmI+Ot
+F4Bv/lCJSIDrJua1s4xE+yC7hrCgQQ9I/ElF0r5K8LGSJgnZi2xnmSb9WDjTcIGP
+I4P298v+ufY7vjJtIf5w3izS2/lPuqOonX6F69AUhyloPDO4XBVHmy0FOpuLePPD
+6huG0cXq6omESVg0XERdmrowvDSjdrI6+m95DG/98KmUCDawq9jxjjc/8iO2BXDl
+QpwANPpgEOduaWZiO6XAGHETuUOc66txDrVog08jTJFQOwXW3qa9loj44eZB/U50
+gz+KtT56HkLzsFd0X906Kr+5iiIbCz2mooEmcjfQgEW6nYc=
+=yhf1
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-22-secondary b/RPM-GPG-KEY-fedora-22-secondary
new file mode 100644
index 0000000..8739dce
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-22-secondary
@@ -0,0 +1,62 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+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
+=laf4
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-23-primary b/RPM-GPG-KEY-fedora-23-primary
new file mode 100644
index 0000000..078b4c0
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-23-primary
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+mQINBFTjh1EBEADJrIhO8LdpWsfCY/d6N9mAD3mDNenFs5XQKWeUnEF7PrOr+oVZ
+K+Qt2FKlluz5DXqhqSpe9LfO2HwXRLqWX4EZDstvgpuJkcEmGGu5qnV6dbSJp3Nn
+cmpdSCYH4Yc4mjxnEY3L6n3kdFQpbEsqm1rYSp7NQqMAfKPV9CGT+1XajNWZ1l+e
+KIS+GSNCoujdtnKkX6ioFTXu7T6XNNNdVLNgwdodIAg4SlTIQ3kd9VyBT36j1r31
+dx0f4Roq3vZh0wmxbyoeZ8oyaF16GpjCjwYQhXgID35WC9mxRYI6DRxmO6vf1TUM
+pscourvEeiDnWDYFfEseRvUIId0RoYGifymFSBcvoBB0ITyQ86N/106VuitqZLi3
+GyZQOIsIQ8qkZVBTIHhnfFoEBdOrTMG4p4Vp5oCIUYGfdpFafUUyIaddING5tkXI
+uwdrKFw682DzutzErelocZxwpHYCfbaF7Emceub7SXJcuDlQ25Y2tNXaVKFcuXjO
+2MBwPldP5aJGHrNPh2TSdSSDFCnj2zocVffojL5Y+yQBV5mPtSr85Q4UduvBPhyO
+Ziy55FBK9XfZaq0Ck4yZYVfnctBXalEpSkPKAtlWfy7uDAjfdtgm8gO8qYqDaB7T
++IbW2631zM9cxuZWzOZPZ5BnZbo2YlNHP/+ZXUqpNO0cNjnisBOWiOdxJQARAQAB
+tDFGZWRvcmEgKDIzKSA8ZmVkb3JhLTIzLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
+cmc+iQI4BBMBAgAiBQJU44dRAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK
+CRAyR0z4NOycup8+EACxni7IFd6AAo2nS4wVsqQL4Oeo6MIJG+P4up3cMlhmg79b
+JiRPVDky9R1tcjK+OLb0TSn5KBP/oUSUeyQRNSygOrwlUQ6wXPfX4/MaYqN3+JVY
+u0rbIoW7+TwrIDYvDurbaH/WkZoi7gcjesl/uJa4g9tY8RGNH0vSI9WTahs+YWu4
+0+alH1k3XHblrS1mROKycZtiMIw6hdC72LM3JHXp1yi5wwAPNjp+IAriQAe6AszM
+ip6cjBxJLT8G+VP/Hzpd+IWmzjKnuO4GL5+e21DhRc8hXHJvwNthbon8GgYbH2S1
+wSmYSsxe6YXGXx+cCsFeewMZRQr7YA/K7HRmELezNpB3Z6oqjNgCS9R9LiHUAbZ+
+woN6TUHHqJONBx2rnczh19mZNn8cLuTqcelk9DlWnOa89yUAYnDfweQ8+9MX9r+r
+zfdF4Dn6ElMUiM2gF05zBwcYtTW2vMmjw7VGouJRHWspHN4Yo1aZmMluxBWtU6E3
+wkqS85wCLTVwBfhkb4Jan8N6fWCSBc2VGluB1H/VK/xAmSOOv8SEXHYrQDsF0fy6
+0ILCxxvhMlREhRVsmUJMmPsMYFQGBAZAUBI5+sRj5I/4AVXG9Rgmfd9VsxE4cEXh
+5Nx8TRdlZirrgLwYkgOOptzI/Et1galB9isCA/3FtlTTPeJAbv9b9pZJUqlEeA==
+=YxC1
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-23-secondary b/RPM-GPG-KEY-fedora-23-secondary
new file mode 100644
index 0000000..da94c38
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-23-secondary
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+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
+7zAN3RLSVZjE6fRnT7xTEvFClgVCXk9gADjIPQ==
+=r6c1
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-24-primary b/RPM-GPG-KEY-fedora-24-primary
new file mode 100644
index 0000000..277a591
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-24-primary
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQINBFWzypoBEADEiE8DQT5k/RPTTsmGKFZ6A0gMH0CH+BY0CLWCMFgS3UnXvUkW
+LJb0y7v/4cdA4ir0CwQIeQmCOD5uwUtgy/nMUUiXqEiKslbvqz+a+fn1S4P3RPEE
+FtG/rrujaY6Y4dSdJfmczHr2X8UUjN+uNwHvWMkE2PKmYUJ9B3ezYSGEBDr+fmxr
+WE923E4wBu3W0EBcwr8R/YuRMW2atBtq2YJoGWEM5Ev7H5RGR4Ah9R1YG+pfn1m0
+TfFfvAqNQCKGjeIfM6gVJWdcay4qyzla6cpTZWxa86OaWNFXeRrUXRSPTJVMUp2D
+29CHjJwMeBqTKGDKmbISzLPprCCNvvg2S9fwZrYXWekB2ktvce2Q248XEdpjbT9H
+FXFA4Fmbzs0x/OuhII6qnpgbbJJHqcigkK7emJ5v9Fsc9k3wrhSt+wO68IKuCtUx
+bfFiFAS9UcLztaFGE1aswojGfncBP8Xq6+VeMd1RSKcRJsWlyvSVQJ+TuHV0TuiC
+vqW5HIXfycy2H6LC3qJVLFAEa+V8lAYKhNFtrK4f+QJUr4+kAblcLU3Fuu4D8uC0
+PI6TICMfXYMrQqjbrZ6T8ZorJLu3rDxHlcG0Z/UVt7DBS3CM8N5tYwK4va95UMcr
+DpMpTyYIADkgxJq03Q65Swx9dlXzY+yKVs6x1AvwrB2G9jeggXyV0kyvOQARAQAB
+tDFGZWRvcmEgKDI0KSA8ZmVkb3JhLTI0LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
+cmc+iQI4BBMBAgAiBQJVs8qaAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK
+CRBzvemDgbRlIfBuEAC0WSAPr3+KGINSqAUY73ubxsOl1vdwcxgG+INsc7GmvZLk
+xUA2zbpY+7hWz97047JfEyJIMK6QsQtZX/tuKy5pUQcoWO1EhyCRdgVd5r0eJYpq
+1zEpEeqRMl9QQ7c5R8mAOW0Vrb8Qe3cvvuralUXncAov+qa5WsyQW6fDroe9nbfk
+IiH5Z5z6uohU0huAuKBB83Q281GzSDVgtIvFNxlc5Ic+Q8/13nZVd0Knszc7NRk4
+kaJuSb13KNxGlDWHhSb9j5Fb7iGWIMIMdHF3IAsUSEf/ZP+Ro9pu6chjyYR8pHGG
+qboX0CWgPijzpreQH6mRMZ6ZYT2u+m45BFZXauBdGI6RcsWyxsRG8lRq8WX6yw0G
+nJS9MHfJY3UGBhcQSuslvDHkVM+Lv59IINcumOGJxt8b2qcUBHBq1q/zziNv1wX1
+PAWBqE7j/S3/zmgVpWejONMjeEwBc+uEQezcVgAVFw+BqsnbVb3e4YUkyutEhsOu
+k36NVV2KB3bsIsx4vryN61bLeZTpN6QXktCFkdM/NyekzMj65IUJg6Ewk9htSjXc
+vqHsgtmvEARcKj3c/kP74L7tXgc/o93VIB/hzIMbkGnQcPLThVp/Ddcq823sgZCF
+DhsiykA32LZQPxKWq0phobDArxldMPLtywTlnA5Ckd5mXHTB7WJ0EGJhw2J2ig==
+=LPDE
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-24-secondary b/RPM-GPG-KEY-fedora-24-secondary
new file mode 100644
index 0000000..b6fd81e
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-24-secondary
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQINBFW1d/ABEACcf5QrE1jVfpoipfa7XTuwle/E5fAf+6QKP26IWI67ReqFlahK
+ReDCBBUoY6zbsuy3LAVOyBZcW+EaY8YCjuYVaqbq+uMvnqatcIEYBWeYyGJOqNk/
+8QBqzLpBx7HBQYCsUCn41b4wT6WWm3aHhogJyNBlr/FchthcLAgGc8Vm3aBdLwXv
+bH0sJXNFDL8HzmnS+MjM7CwoodQ0trP3mrQGTFq0cA3vffzKnvJXwmk40KRa5fwb
+2JhZUaEfUy3BX1+QDFnR9Bauk99+SMFkLL1o/bw12vGNibGvuCQfNE9hVfy2NRTI
+v5ZTKzgwdvhMFQHX1rAqLG9M5CzNWonqF0Oi/NDw8UsTqnhMCUQW/9+4z0XvH3K8
+wZktcWh1Um91K3Y8B+pkaYTis5FCVpmkigBDXhvlkkt5Mdz61twy2I6TbjrjF2Pn
+9ISclUKsoVY/wNJ+tNSUeLpxu757FKw8xTHYRd6H9jm6vMRuIMzuaC5QUfKdyhlE
+TxKiFcDYOVg6L2REyX7Rat8q2dV3Iv66p641KGzkjdIwwEZMtn2jvbIXw+BPihv8
+Hr082PhFHM3OzwZGOQJLj4/pHStYLuhWCNJzQ6YA6mmJXHnoOxH4ZscEiG396JJK
+Zk6svAOEqZfG2RzkA1noQC2kLkXwXhPap7dd5Swhujd9g2jCIrAb15diJQARAQAB
+tD1GZWRvcmEgU2Vjb25kYXJ5ICgyNCkgPGZlZG9yYS0yNC1zZWNvbmRhcnlAZmVk
+b3JhcHJvamVjdC5vcmc+iQI4BBMBAgAiBQJVtXfwAhsPBgsJCAcDAgYVCAIJCgsE
+FgIDAQIeAQIXgAAKCRC4Y17rAw1a7aBtD/9yHeymRy9fW6/4Appvm46IlWi8oAT5
+kue7vJ5gWqEqEsMzwdmHs67KWQBBECWn0GF3UOdBuV+eO+kRZ7yMIEB37+L6AiXh
+LpaPqucBk42iai+Xxj34Ml6i5CodmFbpTxdne5rJOmBVQdsEVmJZyBESy0ynEfaO
+T6U2ZZ+ccaHt2fkKr2/7wdhl6soZ05s16nCEzP0rujQPNx4M/1qX5ipII4wsXIqt
+iHzOwl1lyV9p/+Yazzi6kJ4mkp/aSkEEK2AAZ1QNASUbafIQBqXc6mkK3oo4koQ8
+naPYufFmc2urT8486S4mMynXsITfr4qlFDZPpSNgLDGD/DEkNzsbE4K79/V+O9wD
+i4ux/Yf7x7L7f8NCxJw9QUKPOnYS8b3DYrBtxS3gM8VCVpLJ2r4DyQJd7agF+g6W
+OShqitcrFiTFmC7zbf+m6GhOx8GhI06O2piY7hMYssx6mTBp7qaLf/nwutzovPuT
+oCAuhvP77VDrkVX7PsRYyhcvXrbu0esCLKscaVG8eLP5TUqFaf8lW4Gt1FTdm2iO
+nnG+Fm0WYF4SPDa1tNLQlQaDKSrhFw6ldR8T5uQ+xOA6UaOY1ILWMu3K+nhMtmk1
+9zpVRn0REQ8bdTRVDrpXs5u6U1lkoTlvsgGDOKouGdktwVjKtYrkvPWpB89RSuv5
+ol9x0YlWDbtwhLkCDQRVtXfwEAgArEt7xr9U/FSKaPt6hZqOMEBQGRfhxs3seQ/P
+Qg4H0XMvqbzEvwROSJlVSWwYSXybf6BFC3L9HDyAkdJhRuscrzfMCqdcU/yu/Gia
+zca6LgSxOk5LCvdcqhBDUerSSIW6TbAPyQF6VW6yrH2sHoo67LvfQpOKhQvpEtJL
+sPfbBt5sepi0awRYywgj8kcpPMMUjWqI3UYlh1Bp2geGzK7pg4euo/pYEy6cGzR0
+yEberdODF84ZOlaHAySbH0Lik+8hyaxehLXAkhfHATmr02P9HGUvyY5QNika4Zam
+q6CkZ+BU4rdISvZYfBod0QmvMFCYPu59K+JTIZcB6QCW8YFhzwAFEQf/UONbTirF
+Rtu8v7+WGlSdv74wu17ub56rRsZat/KoB9oL+i4qgApmDFm80X3Y40ZHhhZewdI4
+4HPjBx9kVjf38Ot4bf7UsZx31iJjNOu0JGCRy75aEUeOZz5bKDz1e+6SNwxeEnTX
+n+eVxz+JKNHsU2xtbiirddL6GcT5D5u8sSIN5zIwiEmKTGEXvIL+R9bzWjn52Svw
+iC7bu49i5eRl3wFGQmdEjwLbFvtjO1kuoRIOYgHn5Vnjo9x1hLv34ZiaK2OH0ruJ
+uSaHBCE/1AF9z7Z+s7oE0nltPSRFWcdmLIpwbZp0PKYUxx8oXFyPC0Tqbm0bCwG6
+vw/4L/dPkhgGXokCHwQYAQIACQUCVbV38AIbDAAKCRC4Y17rAw1a7e7kD/4zcH1m
+GQkfMJNWvHbJmI7U9/1B2f9ev5HWzGtOCY1baAuPAySk6LVHk5N95MYaP+6512Ob
+kyjkRAmKveXkxU8PsTqBRJTBuW1r0wKP5l8+rtcQaH9XkIQqdJHoB6uOZT3gtdCN
+rSKBsCi5NQ+OAHzvLvdppAO5Dg9fmpz9+iRq/KFHWWcGwSIDDTySkoIDjkn+2x0K
+kpodfjhm2PVtL2UP5vDM8j4JOxPXAd4041EfDgh/2qVULxHisQw+gplG8QuoE14R
+1EZ4G9wpJUK1+eWs61L/XSMa9sFejaGqeDc4lmyowAc5R6ZycZf7MImIKQtNLBQD
+0AcQNarqrt0t5SuXtTosd9Kna8HnqJUJB8n/Hho0XydUfwbnelsFEZYbXRtma1nC
+/FHHsGS8DueFe9Jfv3+VVpGnfvYBqIL5jc0xEorJA6QqH2/70uKUmAZ/NYpTDSwZ
+mHxPTiE6CRfL3AGMJIIH6s31XeAs2h9zDMKXMNz/k9fiEuOiHngzDuKCERpBXbAy
+hUqufP34hKz1IDRWEXzlPL2DQpZmEMJl4mbIkY7DkDf54s30+W+fRSHowDuC+dY4
+R9KAyQbhzGj+19lgp/6NafP8KIsGAghDN52+g0cpFqvbPRWc78TR0ZuEtubG5rK2
+nls3nqfflOZ0H7ovl/H4s+iKfZZEsyJQCItZxw==
+=uGGf
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-25-primary b/RPM-GPG-KEY-fedora-25-primary
new file mode 100644
index 0000000..c558c9d
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-25-primary
@@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQINBFb9YzMBEACy1RmbMa6MNIpfHYxLwgCgBVnFYCdCHZqWfYYYK14potfJ9uI2
+4Y4w+oHiLeZ/HoG1EBQiDfXHetGZECAKEYQlE7BbRBcd3An9GalKTkWzcshhHFx7
+f5JIprL0uY8x2D9HmCfAjMxoh6usWjmAQ+DUYd48iYCkahyZa0/2CgX9HIcEz/M/
+oDeQbTwzw9AQbQz382oOErfRaXE/DQrjlx2ln0iejidiOe7DzGZOH9/Foc2KN062
+A9VnZ7tU1ACKT8NxZ78RaBL3qmvMGdb7kf7GywjpRNo4J7XCQUP+nP51eCur2wMS
+4mY2idDL8Ojouta79pPrviVLmwzunJoFnBcnIhbndebdxPqgOA5XAOaTdLtgurMq
+90V45DPyJpkdEyptovksH7zYNGEIGB8cFmrVgUwriB0TLNJTEcM4Knbh4imfTX42
+vCE+rEHn3YVqubG7rggibKznJbflwQcqOYZHLlPGYCxO47aaFUo5qJN7QN3lxajb
+SzL/SdoHrVL67unzmHyktx5uF8Fv6EDgUV6NCb/IBiEwhR8YHi86NQ8nsI3K8Zhv
+EnIxghJQD+cn3ykthwqYmZwi2PJDBiZsOGf3iXbalAjU3JVqoA7mboRPR+IBXQxK
+xvAEpyIGeSUN8yBn+JVDRwZ37kkUVs2AOeUwMlnfFSqYFfmqbeQ73A9ECwARAQAB
+tDxGZWRvcmEgMjUgUHJpbWFyeSAoMjUpIDxmZWRvcmEtMjUtcHJpbWFyeUBmZWRv
+cmFwcm9qZWN0Lm9yZz6JAjgEEwECACIFAlb9YzMCGw8GCwkIBwMCBhUIAgkKCwQW
+AgMBAh4BAheAAAoJEECJ2PL9sZyY1TEP/0u/v4g8HEdl9gqlhV179vXCJJiGtzB0
+7IGAu++mrsxBrDpqPZTEs6dG5MyzvhhHcmHYrZIiicPAeL9xlZ75oIqQuvjDncoM
+kROSGvtfUnvocZhQIPvvkgWe3UAmmP3cSlVzu3KtbTpM+KL71incWo4Tentq9L/f
+vsow7vvGbKUMoSSZbAMfjJkzlzSDNlFtaRkrCBQFJ76EKeggjnEZ8H0cowCdGuyv
+uBoxQeeQM13b2T9c/uyrXCIcasaOTIKTcqTjbJUTIC2NIZ8OHjtlxZacEaN3ml1M
+lNRtbIvqzbtv+sb+DsOVTyd1XIcxU9s+TDKvUm0OBNvj3Bm2BQbi8RHyLFbHWvhx
+Gjzb8Wb/MnlcdTlk3M2iPv8dWHXjEM9n9TKyStdpBD9X3P/Gy2gUquHgkl8p+r8o
+xmzNH534mKH47kPL/trKInKwv0fkBwxvuPgHG0n79eMHQenVA8gXzG4P6JkcyObA
+6xGEEQ/wXFF0gLksmwFWuPm2GcnOI5KmGNgDP2PMhS8/cfJfW04a/tL2T2zr4CmE
+LynbOvY/yOJk7/2W3Cb47+yhqo/htrpJDP6n6zQNNk3+e8EVgfhkQqFxom8yCmEP
+pW0gBFeE83VoytYPXRkavwmFR+tplyZfOkXG9gysTn8SpRp5+B44O+VeaZumanQZ
+kRFmBygMR6M/
+=NrXo
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-25-secondary b/RPM-GPG-KEY-fedora-25-secondary
new file mode 100644
index 0000000..526cd2d
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-25-secondary
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQINBFb9eUMBEAC4XFMbnbuiLmUPRqenm9SRcNkrXWvp33iBJBUKfqU2pKApkpDS
+YvLNukZlWDnwlyrXzPB8WJQOcugbtmN7nWK1vjAJnrT9BHPBnLZvsZoYuBnEvzsl
+CbV6cOOal85LFtdqpu5Pir9OD5OSgseubRh21tsuM5uNPOE8pL1ffsRt6zD0paf0
+G1gr5+9rSc2cZ53RgwYBAJV4tethe+RDGSs/6Lrv6v8SkkgSW4USt7R73govRLTU
+XRW6NB5s5S74EiApyAqgC2UMNQZw6PjAGUFw8BFhJcUNzVnIzGrXdMGdBQ1G12io
+5F3PDsqHZ9V3qqLxUgNhlK3W/HvIRv0irRviSOwux8QnE3toSqBaWbS445L9Ar2z
+7SHdEb8InNdV9dcPL1Y5Nes8Do5Sgz6syBVwk4vfJMAs6w7Gr/fdS5OdOCkv2XrX
+f4/Bmxc5GD0KgXTduErcnWCoswJx3CVbUt/a5/DozQH6wxjlxDfVE1Y9DkzxPeoe
+J8nMzidf6N1YkiaF5fRIoUY0edYh4ID4jT/NTRTAAc17BaftK3prqc+x0MWROuiT
+W2Y8tEIZthNT6jBJsVlV9ip0JWGAM4cHScsnuXnoZqFQdpe3En2kcxcWb7t/Spwc
+cMLfrD4YJw4TVRN7qSk/2XvNmM0C1gNpBSGrjXI9JGOY/SBScUx5Mz/9IwARAQAB
+tEBGZWRvcmEgMjUgU2Vjb25kYXJ5ICgyNSkgPGZlZG9yYS0yNS1zZWNvbmRhcnlA
+ZmVkb3JhcHJvamVjdC5vcmc+iQI4BBMBAgAiBQJW/XlDAhsPBgsJCAcDAgYVCAIJ
+CgsEFgIDAQIeAQIXgAAKCRAaGFzd43LoOOxpD/0XWzF+OvKyhM7xz19F6HG6QKTx
+3G6gxnqzrOb9XVB805C7zPEmhURO6TxxZBigwothmjovHMhVrdeVtChJ+UWVy16W
+fpemCwiZ4saLfyMVQQBdovNTwTLAawpp0frkGqO8iGAuEdnCSrTZKZLjg9xiTJyz
+C5slpje5cHEHA51pUUuoK542ne2x+08KMhJ60Ppo8seSRHQSbgnqLSIo9Q3QnA5H
+aRHjb+nb4cvXHsLRqoQbNcjMf9SGe7tDhLzUjeGG+J6b3H3evNp50pMTg610y47U
+rpy5bXjHOEJSx8zFjfXo3SEKFCduDkZUIuBCw8YtjtaRSM2ucym6WZr7Veu6E0RX
+h4xoB9d7kp6gHXfaia9BRlTM4AuLhvlU3CSQycZllrZhW59Pm4DEyHC3aoQZnP7a
+ypPSHlUE16nzTkdPLa/Om9FlyXH2lnwV/dQ3uNZeb5H+wZBoPTpcmgfCSRbZCIxF
+LTlUuZ/LVGN2ZfDtemeNI/Myf/fiGUU4Mc4+PISwvRVvZLJP1W8y4ERcmtK3khG7
+lkU9NgSMDzDvkP/EmXBldciqlTykYAzKw8geShmgL2Tc4bTvqJxDMcDHLhYz0R0o
+KHqpjsRpJt3a0y+Z+15gG1winnoOaIxF6QqXCOWc2M0mIPmazkOXWITQEhFMn/GV
+rYtB2w4+46rQ22pp0LkCDQRW/XlDEAgAhRX7+JqpohxxLest1GrtxWjEwDrUy5Jr
+2fa/3l0wgvQpooHd+RK31m0CvTC5udFz6ysx+L8LC5yWQxHiR5VNSYy9uNfaM8Kf
+BklM2Q2SRZlv/BlKN9Djec5l17aldm/6zgL6/gdx6TkBBdv0SQf5fb/mm+j+ot3g
+LPveEiXUb/0pTiWjEAP/N8yNePctr9JX4M6maTtQq8iH/o6H2byj87wicgr4gaI9
+RDe0F6BgAJ1IVCBt1RB19fPt5Z8BgcNhZdxi0xzn65uYg0lQ5yjwBSHP4qAdLRAS
+aerEhdA0gBxf4Gj1by8fPpaWKSZ3VFcVIP2loqXkm/Uco2+h7AUgvwADBQf+PV5o
+CcgExnG03MMMnCc75vP4hDK+EyOtAWik4WJBuCdNoIoCvysM+GBSXt7XD9FO3qkn
+UEQlWDQMeWZ+NBIQj7tk5WWz9/EZAVdj4DeN3VsbHpgIbOAHwvmNUZjCLvpBE3+K
+FtFZOffX629n8E2YhnLZHHIu6TbPesPPPdqpJbpU7L56nDO+ZqcqMY8rIOeViZYG
+zUBdH4JbwGmq2i9W8tf497CjdWN81QO4li3s688fSj3hcz0ewj+o8WDW/0yy0NkX
+lw7lO2TKownpnLJlcm2aJcptaN7MbmfvEg9mAMdSjd0CFoTSUuzF7/m+C8TyQTPE
+PsE74vH4MHuL7rANpIkCHwQYAQIACQUCVv15QwIbDAAKCRAaGFzd43LoOC1nD/96
+jEXAmjTIvwRf9b9CI+S63JDUTi0WyZaXMEzwfnmQY0KXDwbXuidskbpS3DmCcLjF
+kRdWtiWdzRp6aCT95GxP+kRz6Zy7PkjpPPZQ0Tj+b3zInkOQlodPSTfWUbDztaHw
+zzx5g3L9YebmWULOZvV+rqAWseUw8xJ8VygDnKNBvXM4berDt9B8A74IlCJSvGpf
+zL+UwrCAOJ9etYpJjfqRN+TW3k3COrYqVN7R8Cq42J4sFOE9BhSr26NdTDT3wCrV
+veDRJ20hChETg3mhzTcYj3JIbwEUO2hKVUB+bkOjmCJGYV/sJM87cUdi0D1OacqP
+EbKNCbMidppBcNG1aGY310S4uVB0Wyy/UoqJH9szyIBkT7eWaNthKcd7UnlVRaM1
+vv5sy5ZudJmTpNuupKfpQEJPnRM2uVBm5Rgpa3tawzUDOFM4uM5z/vyZ6zYTkstv
+VN55DlgyUSx5oImtHcYiVGYE2P3pCnxMAFzmxUeIwipva0k2FYf10eavFqvprWHY
+UYkjramXyyDli2lmI5CEWLL3ZUgCzDwWSMxkTdaBGoY5XLVPl+DNHYG2G6F9YqnI
+nmQndpeUwSDspU9Nv/VeSnn+cCLWaJuqpNLNoaxju14OtP5F6GcrKsphlD2zjB9+
+KgCdlumPwrKe3KQBUOKYTnv8MMfulZHueQvy51IDZQ==
+=fWOn
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-26-primary b/RPM-GPG-KEY-fedora-26-primary
new file mode 100644
index 0000000..aef3532
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-26-primary
@@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQINBFfTPiIBEACnRl8tUymlDOBNJWjtICofXNyM4qt2qfGTme3YZ0ZVOay55pK6
+1OLiyNLXyJfDH9d2U6dZn5UYLNdE3QXRVua5GXlSituY0+pzs7n9doW/U8kdhm9a
+zOfyR1Wh/u/FHUmiXUvuwLVzqee7lSU3Ry1voDzPIyM/3/eXDa4wAkbYuestYV2F
+G2VqcMgDIEudYlkz6N1OigMWvkvYXFHVC1A55ydHenWffQzQaPpGuJLA61ARZ5Cu
+X46xgOCPc+aSvAm/D0cmOS7xhZcUqs1A5uGtViZqsRt59Bp0HVNxftfBCO/rQx+9
+FrV1vYXkbTdzG3unlVCJxxC2dW2W6hb3SNgPbE5fgiG9twvVU+3GsFUwARclRWiZ
+HjbWdjlRTkRySzkkdnXalJo3G4UAEDfkvujM2dB4Dt6gVkCPvSKVpK6HTtBdHmDO
+scYfazX/j86somO9npHSrb11tYaLbx2PYfEvw6F7rsxr78/GBjzPnKkK3suXxDlS
+8q7tT1FYV89EzjME5+ThJOyPxyXHKQQwozIXcB/BUfyWGlfFFh8baD+DA8lNgQvl
+/TVFvW6bUV6ll5JoVJJhC87EACL7mlo6AQtwCivUEPxusVXM6u53UKbsc4gVdkZd
+WpUyT2YsgKK05/eVDIkMLHXb3efVbJ6NCj88Fq6hYB7+Y5MRbRFJpvS4DQARAQAB
+tDxGZWRvcmEgMjYgUHJpbWFyeSAoMjYpIDxmZWRvcmEtMjYtcHJpbWFyeUBmZWRv
+cmFwcm9qZWN0Lm9yZz6JAjgEEwECACIFAlfTPiICGw8GCwkIBwMCBhUIAgkKCwQW
+AgMBAh4BAheAAAoJEIEqa0tk2rhdFk8P/1WZFEEBfUr9ywRxeVAwiKx9Ggzf8m61
+p98spnUGj8N53bKwguKnMqAUtm9/XQPRGYRfqKKuKF/4AySCOmqFP86zHThnbFcb
+fMyiJOxBN5N/5dhUxTkZG1M51vFPQx53dnea3w7ypJekTwfEna46PKUD7dTV3HJg
+d2YOojD9mxup0iAmi7/3mi0cHwTCZS9FF/A4eBWjuEd4OM3KzPF7HBdY37a1IBLR
+k7wruMEGSq6EXcoeqG2sMmU7RnEeQxy3WqMYdRdzUjbfBN7mCAcuv2yKB1FFW4/v
+PhP7ObpCCLiaL46APdGFHZ30EC4oaeqSygJ8+zAIFK40t/a0iNNf8ZKKeeuasinr
+qNJAep/WoVjIpx/LlF9vw522fhYXJ75LYLBCQNke/4rQ1Rl29io2Dg29aPrEwFPj
++7zDztdvaGmu5wLPvsC+w5pyqOT2LPC19y3D7T+KfXp0gEwyZedviDwZdIXz1PX1
+IMytlwRXlrhkp/2WzJvAkJCmRSb8QsxY9Y2A4rfqrNCk6kgjc+3pXNdxumaXEp33
+pjm+z61Qrg2XXFHUhQyRiBnEtyo2Hj3tJQdrPxwGIgtKFZCv+oAwewnMw9TFycI6
+rYEfS4wdAIOGoSF/PL9Eq2xoUJQw8QFCrURm7sfS0/VmvXoSjqzZLeWI4e+JvId0
+QFFBR5ZKOqzo
+=DGPs
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-26-secondary b/RPM-GPG-KEY-fedora-26-secondary
new file mode 100644
index 0000000..fcafc18
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-26-secondary
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+=P9ev
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-27-primary b/RPM-GPG-KEY-fedora-27-primary
new file mode 100644
index 0000000..0ab4704
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-27-primary
@@ -0,0 +1,28 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFiskqMBEADTbsoAXpDPk+FtcwBEPZQVe0YQYdOqavfQQVD/RYAcHnJW/K1b
+ZhQusBjUIec9SfGi3uBNNmbziAvpd/ycMKyWHuWQLmBgbImrqnPbBPMXmxeNGnZj
+A1hjVDp0pzj2+gZQhqYWSf6kQy9u9A1mSU63Kl/tfw7+hX7Tc3I8feGAFCHcFQgE
+SxUib8Mw/OOGR3Am9fKdA+K1kJeQIiZvXMcNFx+3CfoavhFdicuoT2KbcSuzRm76
+duKNHlLaP6/IbZxNiDWh8SDVpFaFPlqR/R/+wibA6e9wMf6CZ4vfUY7NKYf4tYBs
+0EYdkn3j/KhJJxdb+M46Q/xwq9ovZo7XIhLrIUPuMw91X9cbvkU/a9kE1ffdpNmF
+1fDnUcEkuuEqOl+aMVsUBEbAQ86yrwpDfL4XT9vwnDIkggKZyvDTZ6q00XKg3Ger
+KuZtQBl/YcHDXuBlB1fzpGl8a8hq/+GeT2sVxjlYwPXjrsKd1NeP6ctQsR6gHuP3
+W5ohP4rArtM6ONN8rlTiodDLVGHBpUzIRdgr7RCL1AqB9vrdQ2MVZMasTcUnUvKo
+0H4mps+x05jGao0b0Z0TJc6wr6ybHH38NVG06VX5rJZlfZchGwkWzmYxai55/7ln
+1vJmk+kbdS7pK0jfmeVJ8A77XLCL36oJFCiCrYjV+ZGgvB+z08Jzwc7sgwARAQAB
+tCxGZWRvcmEgMjcgKDI3KSA8ZmVkb3JhLTI3QGZlZG9yYXByb2plY3Qub3JnPokC
+OAQTAQIAIgUCWKySowIbDwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ9V50
+MPUoLuTcww/+LFPVEyVguMeU/QABEsE5FEN7kcDReZtdwq7p/aKC29mzCxeHggit
+YOGlrINkJ26Aq6p+oW6w7JxBWJnKoTBYJDFzNIbp/6GbG4oKcEnWQZfTnRLTr5au
+kVdWBFevzC0huraobKz3joYRIX826VUzS/A418zpnDVPtpo3x86V9f292rqi2tn9
+Q5cQC5Ck3/cjQDEwkN9gHz4j/c1oa6zBOcHbKkaZdWA2dIs6XOxCIHg78i6VQwMM
+s+vfm2vbV3ACCcOVnd3d6NxIQuDLEQwdtdB2zI8R74bjacosrcafK+F2DnkM7WrL
+SCiTKLJBMRDx+X2nOjT5pLuts4FC/XYRO23SMtPAMzQ852Z1lkjsaVDsjzNqCasU
+B0vDPHLQE8aj0zchNBSzuHoKpXNYTyJztekWL/QXkUsXu0x7N5WhBlZ+lni6LtZU
+51l7BJd1n+ZKnQ4gmjQ1ffVLbgzb9Z1MNje0s61FdKmUJQGULYqh32W4GV+RLvtI
+6AJV/EmFCUEfRJ3eA8tJiyKe512wiim/WDhvzFuuPBup2Z3TufiaJQOysLlN5+HU
+QitTtcd7j8ZgpsIAIZtSWOMxbIAJWbzn8gjfIj4ZDeo0ZZXH0VgDkXtpv1g8R2aR
+Az6ob5YYW5VnI2UEr53x1Z7lmUhv/TUZn26IeU16jCJ80k7pJvQSF8Y=
+=xpp1
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-28-primary b/RPM-GPG-KEY-fedora-28-primary
new file mode 100644
index 0000000..f7a9d31
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-28-primary
@@ -0,0 +1,28 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFmSAVYBEADakUeJgNnAP2CE3vw+iI0Um9XvuBP6NdESRiJIEPgXhKWM058J
+PZDkpRETS4pbB3xUyPLoogoO76lheBEOPEAGp5mb/7vEcwlYqjtuetFi9hcsbNPx
+DeOLQ9KR7Xs2idU+DlCJW1WyU9UiLoyZpQgAqF7Y50MoxPKJtfDuM52YkulYLU+M
+leRtxJzHYcXArU3x3Czz1FnemVtol3/1/BvmGQPIyj2HdG4vxWbiX79AUSlchh+M
+bNqOOpVVK16lLEbJCxCbPdCsKCTOI+FsdQsB4bnX5ddNcvxxACwHNUifVD/1XH8A
+x77DHohRbccRtIZqZEIKecHxVyFdr2mAl9mEXSzaFvRzWa+5seCgGoV0INBhj6NE
+tHhSxBYzLmr5noQ8JNPa6eRipPvYTle2vstq2YUJ8D0ZbKbxaCPstemCQZrQKzh0
+tgezIgVXKc2U0i3ZOEYf4ISMHeBnH36nRMBnaH/HkLyZyHXNE4vswJpwPjNtaofz
+QDD+TmCe2ObKei8iUqfLo/8Je8IvnodS9C5l0fyEaMmo5BWc+SYRSTR9libNruwu
+4j6Kuoxge9SbRuD2S0qzKK2LYRZrlkxjP8REnpvXxUfeSvNYHrbjzYDv677S6pqW
+dNqyoPduKiZWy6Vg4g+pYmk5T7vrpNizGK6exKiYZ5tAUaO3lrdpHOolUwARAQAB
+tCxGZWRvcmEgMjggKDI4KSA8ZmVkb3JhLTI4QGZlZG9yYXByb2plY3Qub3JnPokC
+OAQTAQIAIgUCWZIBVgIbDwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ4I5+
+Yp22L7GMDhAAwwQhpXFXxegkgi0pFbA98Om3UBiQtcDemQSls0HEJh+J9sm4g0Sj
+2K7khFnJCKsQNVnJDVxvxJ9j/AFZErRMjudUF7ACZfKDtNxq3gkH7qICPKk/DzeX
+blrzPc/RX+kkl9I5jFBhapypsExa2yilfk8IiKq6nd2Ro7K+gEh/CMhfe7YBGInZ
+3FmZWsq1+WKTZCUNmA8++eWIbmukrAoieTHTvIcOmc+dfaUAmjWtOnc69E9UmTCw
+EMEbPVMSmZv0qnp0kByWUeV5cZR7NoXmaMaTr5aUY6wJuLshbWzgmudorf1udUwq
+YlpxZJtQCxlHezulrDJG19d4dC5vGdYbnpeq01s9L9yieccKafWfldBU+YBZbo9e
+9Uzu/766pxEAtqYYSyZboiqsj5NCoq2fRc4DjfCDVEaK7HSPcQpQFA+p18sD2qcc
+EPPo+F2+M8PZLf4khipGRH1nm9AmM/v25a/9w22bDuUUvpcWwW45YsNToTTM4d6T
+s750lCw/4K3jHnrQWxL7VfwLw0H1xlxnVqIXlL3HeOIn9EoaygxV2gJtPjB/Gwr2
+z/K+HoibAxvo7VcpxD+N38LaPtrx/ERMxeYBJvMgSqGaC3MXj36/qv0zTyyTItYX
+9JfbOrikoJa+aKQGmTWLrcuKaYl6Jzsq3vRTbNRRi4SpXwTwMyuW4pU=
+=fo1W
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-29-primary b/RPM-GPG-KEY-fedora-29-primary
new file mode 100644
index 0000000..8ca7638
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-29-primary
@@ -0,0 +1,28 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFqIZTcBEACjh0DKywPd0Hx9I4nGYsbUbqIU7TGZgxaT9jnVSRgkcdfRqt2C
+P7EdtRbyqkMUKyL23CLwAz+YSmf9Ff9nxBSl8FiKUCNNWUYO3faEAZkZ5reDr6h6
+W4a0niBMWfVLqmYjpZmkcBqgLgl+2wVq9/E9Fq9SzDktzczUF7wwAWrsKW5rwEEq
++i8jk6FSUTNMqWZq69y7Dvox8k8QIxtou5dIL3Z8qQdkc/0ynTs4bdac94FsJBM6
+0qKSHP23MY7ppwOl7wttAsnaIzBaCD0UIM5qtfFBNFaYfeJ5kH1rf+NzgFjJ8y1D
+xiZdEX2t4OyXvhuAQSvYyotDrJzCbusjXQYMYYqnfGcqMmTCkgGxYbdfVGbMs3x1
+mMObZWMQbb9HGN0KTBaFdwA7EnMBrCGy3I9WxngGIGATOPWkPPUUxlaI9jwxT3tq
+bwYY5Kn2RhD4CZyj4VIaQvGdMaop01O78QVFHhdH24abqNuPrYqEDZ+aSTgnYFKJ
+cpGSsRVL+Kw/x1wik8PYzpC9tNzU1LRCi9jsX0pk9gODSgbKLWryZEgZaIdcBcJD
+4U3slDjdBeTDY8pJV9z9r7z+gFPAHLqStGKj2icbv80dMGTfgUm3HqWES/XXomX9
+ZWA1tV0ZlNOM8/IunmISz9MNpc3LChpcccffjrfvWBfokDKaXO9qCUgctwARAQAB
+tCxGZWRvcmEgMjkgKDI5KSA8ZmVkb3JhLTI5QGZlZG9yYXByb2plY3Qub3JnPokC
+OAQTAQIAIgUCWohlNwIbDwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQogql
+a0KUdrR7axAAluNHQ93T7u/yIQaTCs4uGb/jEg7qbm6hRx5nsqrdm3qKNqnyXK61
+nnPNoDJNk1WhZww4RdrvxCDOGyyNhGSejjvXM6RBDEOY/KmD6huPo8xN5i7JVG+E
+2mlwTGe7HSg47d0wHydDNTRLQqT0VZnpkxRe3puQ4DNNHJZG1SsRl/Sf2VI1XyB/
+hHbFGbLS9KvH32lCIAAtt6dbGTRZC9gsGL6XR/6o7EU5fpj7U5rYiDTFaYqmqG21
+LZZV9xtqCoHcKElY7jX7Rfmk8Wn1G2zC2XR0LX7eVH7GBeXw6JbmLZjxSgd235zE
+1lNSaSLMHOHMcgSHWoEC9ULzLYJuTagjK3cjk0VkKLocakRcsb9dtFcxgZGdQHfM
+X7mD9epuJmqB4a6TOZoL/tiq28ORakUbjYfLz9ngnqd/pJkn9MNWcxy3yBtOdTYq
+ce+61/XQk4cR2tH8V2eP7fL8YMboNkPPbcbKlcvKG/TgaS0tVrFMUmA1xmDihzf6
+gupAANlcMkYo0hm+z1hLvgqosp14oTocJeXLAFVw5dxnb9bmqjBy+77u/rqrY0Ek
+LQd9XnXgowUQl0RSNXgcIIfEkVBipL/2YB+MFBmMQKcTDXX7lc/hl6W4BFmVj2KH
+kPdZzUOJQVYfe90Rt3hfXHViUw118hkTaJhrCPVwkFbaUWscEA2OaFI=
+=QzSY
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-7-primary b/RPM-GPG-KEY-fedora-7-primary
new file mode 100644
index 0000000..17d4ec7
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-7-primary
@@ -0,0 +1,27 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.0.7 (GNU/Linux)
+
+mQGiBD+dnTsRBACwnlz4AhctOLlVBAsq+RaU82nb5P3bD1YJJpsAce1Ckd2sBUOJ
+D11NUCqH8c7EctOquOZ5zTcWxHiWWbLyKQwUw2SUvnWa5SSbi8kI8q9MTPsPvhwt
+gMrQMLenMO+nsrxrSaG6XcD+ssfJNxC7NQVCQAj3pvvg9rKi3ygsM7CXHwCghgsq
+X6TOr55HE90DbEsoq3b/jjsD/i8aIZ6urUgrpAkQslcakXdJLKgSdwjRUgVZgvYZ
+b7kAx1iPq0t/AhB3NJw3zW4AAKJohGg3xj5K4V8PJEZrSIpoRYlF43Kqlfu2p5gh
+WT89SP4YAlWPeTqf0+dTYUYz3b144k2ZFOdRuXIRxunoYNAUr9oMrxBXbJ/eY+0U
+QX3pBACYzKizyY4JJgd0zFJmNkcdK9nzcm+btYFnYQo33w5GSE686UNr+9yiXt9t
+mPRvNEbj3u+xoAX8B/5k3aZ5NbUhV64/VcKlUdRIxNlFCG7I9KgxeHWAYwi7yqOG
+XM3T/v6o7GLdQEB0ChFqS7kUlqmwLV+C3QhlrFe/Cuk26i+Q6rQiRmVkb3JhIFBy
+b2plY3QgPGZlZG9yYUByZWRoYXQuY29tPohbBBMRAgAbBQI/nZ07BgsJCAcDAgMV
+AgMDFgIBAh4BAheAAAoJELRCadBPKm/S2PAAnRTlhorITphab+oxAHtbxZF9BVyD
+AJ9WOVaZUG53IWWIAXOGv3j/cmr3lohGBBMRAgAGBQI/nZ22AAoJECGRgM3bQqYO
+R5QAoIp1G+omVktq/snxpmz5UeHjlSYjAKCRr/ea/L7S7ZTxB18cf1TYfad1x4hG
+BBARAgAGBQI/ntjgAAoJECnVuiSN9W0FUSUAoJnrone4J0o1HMkRz+6g9KVuO2Fy
+AJ0XyebOzVmI9U5OyOfnNmYV0wnQcrkBDQQ/nZ08EAQAugOfLWJbKwMA9vg2mJU5
+94TZU0HRJkx/fqYhx0YxWWRpzplrEyvcDXuYcWi1Hwh0tD86T4fR5GV6joWiWClz
+D+Hwhhb6gcSdeSGlGLlZAvWYtFSHWiv+3LaI9w8Vtczl99Bh2WiMDNDDGw0RQg6Z
+aftldLSe4j1pffpFGQ8SuisAAwUEAKVxqLT7fC5xQ6oclcZ+PhoDlePQ1BiTS7tu
+GM07bFF4nNvY91LL7S31pooz3XbGSWP8jxzSv1Fw35YhSmWGOBOEXluqMbVQGJJ5
+m8fqJOjC0imbfeWgr/T7zLrJeiljDxvX+6TyawyWQngF6v1Hq6FRV0O0bOp9Npt5
+zqCbDGs/iEYEGBECAAYFAj+dnTwACgkQtEJp0E8qb9L//gCcDVYnDegNCOxDn1se
+dDwxw+0h8OcAn1CZHof15QqxnTwEnvwF2QeOI5dn
+=mJAx
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-8-primary b/RPM-GPG-KEY-fedora-8-primary
new file mode 100644
index 0000000..f9459a7
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-8-primary
@@ -0,0 +1,40 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+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
+=Bp6s
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-8-primary-original b/RPM-GPG-KEY-fedora-8-primary-original
new file mode 100644
index 0000000..17d4ec7
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-8-primary-original
@@ -0,0 +1,27 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.0.7 (GNU/Linux)
+
+mQGiBD+dnTsRBACwnlz4AhctOLlVBAsq+RaU82nb5P3bD1YJJpsAce1Ckd2sBUOJ
+D11NUCqH8c7EctOquOZ5zTcWxHiWWbLyKQwUw2SUvnWa5SSbi8kI8q9MTPsPvhwt
+gMrQMLenMO+nsrxrSaG6XcD+ssfJNxC7NQVCQAj3pvvg9rKi3ygsM7CXHwCghgsq
+X6TOr55HE90DbEsoq3b/jjsD/i8aIZ6urUgrpAkQslcakXdJLKgSdwjRUgVZgvYZ
+b7kAx1iPq0t/AhB3NJw3zW4AAKJohGg3xj5K4V8PJEZrSIpoRYlF43Kqlfu2p5gh
+WT89SP4YAlWPeTqf0+dTYUYz3b144k2ZFOdRuXIRxunoYNAUr9oMrxBXbJ/eY+0U
+QX3pBACYzKizyY4JJgd0zFJmNkcdK9nzcm+btYFnYQo33w5GSE686UNr+9yiXt9t
+mPRvNEbj3u+xoAX8B/5k3aZ5NbUhV64/VcKlUdRIxNlFCG7I9KgxeHWAYwi7yqOG
+XM3T/v6o7GLdQEB0ChFqS7kUlqmwLV+C3QhlrFe/Cuk26i+Q6rQiRmVkb3JhIFBy
+b2plY3QgPGZlZG9yYUByZWRoYXQuY29tPohbBBMRAgAbBQI/nZ07BgsJCAcDAgMV
+AgMDFgIBAh4BAheAAAoJELRCadBPKm/S2PAAnRTlhorITphab+oxAHtbxZF9BVyD
+AJ9WOVaZUG53IWWIAXOGv3j/cmr3lohGBBMRAgAGBQI/nZ22AAoJECGRgM3bQqYO
+R5QAoIp1G+omVktq/snxpmz5UeHjlSYjAKCRr/ea/L7S7ZTxB18cf1TYfad1x4hG
+BBARAgAGBQI/ntjgAAoJECnVuiSN9W0FUSUAoJnrone4J0o1HMkRz+6g9KVuO2Fy
+AJ0XyebOzVmI9U5OyOfnNmYV0wnQcrkBDQQ/nZ08EAQAugOfLWJbKwMA9vg2mJU5
+94TZU0HRJkx/fqYhx0YxWWRpzplrEyvcDXuYcWi1Hwh0tD86T4fR5GV6joWiWClz
+D+Hwhhb6gcSdeSGlGLlZAvWYtFSHWiv+3LaI9w8Vtczl99Bh2WiMDNDDGw0RQg6Z
+aftldLSe4j1pffpFGQ8SuisAAwUEAKVxqLT7fC5xQ6oclcZ+PhoDlePQ1BiTS7tu
+GM07bFF4nNvY91LL7S31pooz3XbGSWP8jxzSv1Fw35YhSmWGOBOEXluqMbVQGJJ5
+m8fqJOjC0imbfeWgr/T7zLrJeiljDxvX+6TyawyWQngF6v1Hq6FRV0O0bOp9Npt5
+zqCbDGs/iEYEGBECAAYFAj+dnTwACgkQtEJp0E8qb9L//gCcDVYnDegNCOxDn1se
+dDwxw+0h8OcAn1CZHof15QqxnTwEnvwF2QeOI5dn
+=mJAx
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-9-primary b/RPM-GPG-KEY-fedora-9-primary
new file mode 100644
index 0000000..f9459a7
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-9-primary
@@ -0,0 +1,40 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+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
+=Bp6s
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-9-primary-original b/RPM-GPG-KEY-fedora-9-primary-original
new file mode 100644
index 0000000..17d4ec7
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-9-primary-original
@@ -0,0 +1,27 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.0.7 (GNU/Linux)
+
+mQGiBD+dnTsRBACwnlz4AhctOLlVBAsq+RaU82nb5P3bD1YJJpsAce1Ckd2sBUOJ
+D11NUCqH8c7EctOquOZ5zTcWxHiWWbLyKQwUw2SUvnWa5SSbi8kI8q9MTPsPvhwt
+gMrQMLenMO+nsrxrSaG6XcD+ssfJNxC7NQVCQAj3pvvg9rKi3ygsM7CXHwCghgsq
+X6TOr55HE90DbEsoq3b/jjsD/i8aIZ6urUgrpAkQslcakXdJLKgSdwjRUgVZgvYZ
+b7kAx1iPq0t/AhB3NJw3zW4AAKJohGg3xj5K4V8PJEZrSIpoRYlF43Kqlfu2p5gh
+WT89SP4YAlWPeTqf0+dTYUYz3b144k2ZFOdRuXIRxunoYNAUr9oMrxBXbJ/eY+0U
+QX3pBACYzKizyY4JJgd0zFJmNkcdK9nzcm+btYFnYQo33w5GSE686UNr+9yiXt9t
+mPRvNEbj3u+xoAX8B/5k3aZ5NbUhV64/VcKlUdRIxNlFCG7I9KgxeHWAYwi7yqOG
+XM3T/v6o7GLdQEB0ChFqS7kUlqmwLV+C3QhlrFe/Cuk26i+Q6rQiRmVkb3JhIFBy
+b2plY3QgPGZlZG9yYUByZWRoYXQuY29tPohbBBMRAgAbBQI/nZ07BgsJCAcDAgMV
+AgMDFgIBAh4BAheAAAoJELRCadBPKm/S2PAAnRTlhorITphab+oxAHtbxZF9BVyD
+AJ9WOVaZUG53IWWIAXOGv3j/cmr3lohGBBMRAgAGBQI/nZ22AAoJECGRgM3bQqYO
+R5QAoIp1G+omVktq/snxpmz5UeHjlSYjAKCRr/ea/L7S7ZTxB18cf1TYfad1x4hG
+BBARAgAGBQI/ntjgAAoJECnVuiSN9W0FUSUAoJnrone4J0o1HMkRz+6g9KVuO2Fy
+AJ0XyebOzVmI9U5OyOfnNmYV0wnQcrkBDQQ/nZ08EAQAugOfLWJbKwMA9vg2mJU5
+94TZU0HRJkx/fqYhx0YxWWRpzplrEyvcDXuYcWi1Hwh0tD86T4fR5GV6joWiWClz
+D+Hwhhb6gcSdeSGlGLlZAvWYtFSHWiv+3LaI9w8Vtczl99Bh2WiMDNDDGw0RQg6Z
+aftldLSe4j1pffpFGQ8SuisAAwUEAKVxqLT7fC5xQ6oclcZ+PhoDlePQ1BiTS7tu
+GM07bFF4nNvY91LL7S31pooz3XbGSWP8jxzSv1Fw35YhSmWGOBOEXluqMbVQGJJ5
+m8fqJOjC0imbfeWgr/T7zLrJeiljDxvX+6TyawyWQngF6v1Hq6FRV0O0bOp9Npt5
+zqCbDGs/iEYEGBECAAYFAj+dnTwACgkQtEJp0E8qb9L//gCcDVYnDegNCOxDn1se
+dDwxw+0h8OcAn1CZHof15QqxnTwEnvwF2QeOI5dn
+=mJAx
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-9-secondary b/RPM-GPG-KEY-fedora-9-secondary
new file mode 100644
index 0000000..7b73326
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-9-secondary
@@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+mQGiBEg8YEkRBACBI439uRaWbaRek2H2YjSN9ROQFQeYyj4tUf1cnwsZ9r8enZIy
+VvsSwiDdSzR8wakFGmdjR9O5Lh2V/QHXYaTaTFBtSI4jDnITzkWQxKQaLbOyuBGs
+kXeJRXYNhS9toxAh75Q0j2PTjeta0Fzqobg2ehUxSZuWD8c4LNCdjxawzwCglOkb
+udBGDZ88EFucQyAZX8g5sbMD/j+LJ/ymm4IDFpFwVTwM3+JQpbyrt9LRH+UIDKRX
+9aNrGbdGgVnujbuHLWaAwkpA7wDvvDXAahBIJYMbId2RSfVkKBnTjcgIO6dNeIof
+ec0a50DY7wECLLhlszLog/cDL3ZHRSrH0S9o/FydBRlWAI3x84RxAlesPI1UjGOX
+drmLA/99p9cZYnlrjKwy2vMP7Qj9aIMPmnthxah8s659UFM859NKC2WUheoMNIYg
+hksC7LdyhHs1MCIW1lrlcydrxvJ4Wt5Em2e3IfFutOI4kJEVwGME8QJm3RTYVmD0
+nHIJQcI/Zuj48nN62VbSfxafE/2B5JpXmQ/TUHkdpKJSUVemOLQpRmVkb3JhIGlh
+NjQgPGZlZG9yYS1pYTY0LWxpc3RAcmVkaGF0LmNvbT6IYAQTEQIAIAUCSDxgSQIb
+AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEKijtzH2E8vodKYAnjOR2Q4JdAFW
+Y4W6oFvdayD3dOvFAJ92AkZkTQln4rir7Jlbvcv6SXx66LkCDQRIPGBJEAgAq47Z
+iOKt1BaVcXoxUKjoKdSam8r0VFCddj3cTdr2e8UpjsJe3Zq7Zg0htbA83T7gpeor
+mUJQeuNNLy3QkJOZDdoAqePxXgor6o/3b/7ua9GbMdPTrhQrTmjRUK+SwPHcFBSz
+Rm0Bh7UEqvtF9kHnvCdHEIfXMuxKtvZAjGww2KThBlO6FM9umgSbXwVppIDsCEY4
+29yp5+TUHsjAWGdXd2KtFWOvdLPPJxOm+TRB4gUT1DbN+OxtLPBV5efbv20mvYvx
+g3V93vgcrAgZDKuaho8z0O63/iIAEVR815gC8YmGgCRsFSKdYBbr+TPFw78oayAE
+Zf40Q1RYjiD5DimZXwADBQf+L/YLN7MvnZXr00oi2NU0DRX6Z+wn4ZM0XkPYrG12
+8ia3bwga26N+Y+lwrLD+RBMyvaD52ojBfUhaq/1xASAOUY62ZLBUw/zw6TKJuUN0
+APeypK/mAvdz2eqXNnW5X1EEehPVsQO3mXrrzRcT77GW/GJFe4X+Urusn9MNLrKA
+eDJLHymrkmlbgKC8zfr0gaGpcF9HeI42x7PNab/pKsByhlfvSEHt4KtLKmXFc5YU
+xxBS3poNLtJq7z/CSbAIGAFas3OiFpFNBEnP4r00iiUJoJx7z5kBoLJVccAjMlZz
+IeeO9j+srAgaeNn3GJGWlUz4qkZfqNn+hOwjbHjKgwv4U4hJBBgRAgAJBQJIPGBJ
+AhsMAAoJEKijtzH2E8vo+Y8An0zr8BtAzPVrwxoWg4yIrLCPKAxKAJ9rhIoD7Zrk
+h6eXZT/2ouDGQxoI7A==
+=BxWM
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-modularity b/RPM-GPG-KEY-fedora-modularity
new file mode 100644
index 0000000..99b0291
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-modularity
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFkbN5MBEAC9zjfb8joJxrX0eawhKizSZlKnAaNXhGeg5NauRy2t34BVosbO
+e1z5tohrV7OAhB1X97ZkrsKg0ENTwlTYn/DI/bTU0Z+OG/bp7Fj07jMuYEcobKCq
+5BkspPaW9pHZ/Z070ZZxPpccWvGt1WD/KIno1J98Hszh+KvpDOW9voLdOc0KBvrw
+gZuAUB53Cjljeb6x871IFjF0UgvuPlklF7GlOU8mN9OoMDGUU8lr9qhYSkdFz9Us
+NyHLWDi3ySHYWF7L7NdOKE+5j1emy1kNt5gaTr6XTPOhfvq8VZHZA/AXLRGB9TkQ
+W6/VNzBbiEV7GT6ypDjHQ0ir0N+M0CZtOOBEIwToDWj/8pSO+onT/ChCxO0o0o96
+zjKPcPocxlVZE31klARMsHfG8Oi6uw1oHEfQH60yZYwCdA2GRu3OK6N/t/tqXH96
+WfOh2AjPiHvYf8Wuli1l2OMGj7Uzo6oxuS4nzB1zz4G1KEGDZbned0o65fcxi0+4
+B8pAvnucBI+AE78HaR9/ehAsI2P7KMP6WiKPO5BfELq2wC4bWaZbROqUuGgQ6wwK
+4C6oP27ug9n/ce5GlHTPNenAeC8rtUGCWv+2XayHdAG4rHB5VLDywyD+/6bwhVM4
+gPIzKkm7exR+mylwsNiXl7gwBgdNdal4p2rY0hJuLwsx4lLFHXFVjFRtxwARAQAB
+tEhNb2R1bGFyIEZlZG9yYSAoZmVkb3JhLW1vZHVsYXJpdHkpIDxmZWRvcmEtbW9k
+dWxhcml0eUBmZWRvcmFwcm9qZWN0Lm9yZz6JAj4EEwECACgFAlkbN5MCGw8FCSis
+we0GCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEFvBtSejzE5i6f8P/1AeJgzC
+GDBFKE2RLlZXtqDv+khlBeSVVRrfLyiJNjEnUFq6X6XhDDb8ldZq4JpUB0sy8Eux
+NBef3n1Yw67XY5ZWOdDgo+ci2yeog7Ch5Hv59jvwpwnOnsc8/JOUwAz4EkxjloUh
+YV3afXKFOM15HAKFRJ/OerKQSy0KWHsd9KWIgBEOb5FAwrH86n3zLuuAUnjsiE7V
+kXh2zxehuD+rv35u17CL3H5R3tO3V1xzw4oAMoIspuJxipBB2+nXN6A1iFw1yQA8
+5g91tUmJ+6jwLYpNhhgqkPCy/3j05Ut+hyP2TfVushGfwphXc3cg8UWbRA1OgzXS
+A9VoVwp/lcud4NlJ2OXIvCALgCcYrEQ/hxEROeqNHGsijgQ+1TEbh5fqbSOn3aZf
+dYp03ADkJvvS1a9U7f+dCpiUNXemj6nfCT5BsKtUx59GUdZrrfSMbtsbeuwHyWRp
+LAUJyfckeck85DBzzqzdjO+vpZCvcOloORCwMKHyM4JwqlW66Atkl3NnnVSFy/XD
+axzUVmuyFC9FkE3y/ySzyuvz7szMuh2Eb7bOZIieidmIEHyIWSzUV0yAp0x/kL+m
+dDd9eU7zoDJg2OP52kp5+kTrrpviBoSMZEfZ1qHuFWlW0S53d3U9r6Q0UR8Mcp9X
+wpBnI/lOAxRdO7Gth1pRlzZOIiZYJfBx0IDp
+=kX7M
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/archmap b/archmap
new file mode 100644
index 0000000..b78f7f4
--- /dev/null
+++ b/archmap
@@ -0,0 +1,60 @@
+fedora-8-primary: i386 x86_64 ppc ppc64
+
+fedora-9-primary: i386 x86_64 ppc ppc64
+fedora-9-secondary: ia64
+
+fedora-10-primary: i386 x86_64 ppc ppc64
+
+fedora-11-primary: i386 x86_64 ppc ppc64
+fedora-11-secondary: mips s390x sparc sparc64
+
+fedora-12-primary: i386 x86_64 ppc ppc64
+fedora-12-secondary: mips s390x sparc sparc64
+
+fedora-13-primary: i386 x86_64 armhfp
+fedora-13-secondary: arm mips
+
+fedora-14-primary: i386 x86_64
+fedora-14-secondary: arm
+
+fedora-15-primary: i386 x86_64 
+fedora-15-secondary: arm armhfp ppc ppc64 s390 s390x
+
+fedora-16-primary: i386 x86_64
+fedora-16-secondary: arm armhfp ppc ppc64 s390 s390x
+
+fedora-17-primary: i386 x86_64
+fedora-17-secondary: arm armhfp ppc ppc64 s390 s390x
+
+fedora-18-primary: i386 x86_64
+fedora-18-secondary: arm armhfp ppc ppc64 s390 s390x
+
+fedora-19-primary: i386 x86_64
+fedora-19-secondary: armhfp ppc ppc64 s390 s390x
+
+fedora-20-primary: i386 x86_64 armhfp
+fedora-20-secondary: ppc ppc64 s390 s390x
+
+fedora-21-primary: i386 x86_64 armhfp
+fedora-21-secondary: aarch64 ppc64 ppc64le s390 s390x
+
+fedora-22-primary: i386 x86_64 armhfp
+fedora-22-secondary: aarch64 ppc64 ppc64le s390 s390x
+
+fedora-23-primary: i386 x86_64 armhfp
+fedora-23-secondary: aarch64 ppc64 ppc64le s390 s390x
+
+fedora-24-primary: i386 x86_64 armhfp
+fedora-24-secondary: aarch64 ppc64 ppc64le s390x
+
+fedora-25-primary: i386 x86_64 armhfp
+fedora-25-secondary: aarch64 ppc64 ppc64le s390x
+
+fedora-26-primary: i386 x86_64 armhfp aarch64 ppc64 ppc64le
+fedora-26-secondary: s390x
+
+fedora-27-primary: i386 x86_64 armhfp aarch64 ppc64 ppc64le s390x
+
+fedora-28-primary: i386 x86_64 armhfp aarch64 ppc64 ppc64le s390x
+
+fedora-29-primary: i386 x86_64 armhfp aarch64 ppc64 ppc64le s390x
diff --git a/fedora-cisco-openh264.repo b/fedora-cisco-openh264.repo
new file mode 100644
index 0000000..7b29acc
--- /dev/null
+++ b/fedora-cisco-openh264.repo
@@ -0,0 +1,24 @@
+[fedora-cisco-openh264]
+name=Fedora $releasever openh264 (From Cisco) - $basearch
+baseurl=https://codecs.fedoraproject.org/openh264/$releasever/$basearch/
+type=rpm
+enabled=0
+enabled_metadata=1
+metadata_expire=14d
+repo_gpgcheck=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
+[fedora-cisco-openh264-debuginfo]
+name=Fedora $releasever openh264 (From Cisco) - $basearch - Debug
+failovermethod=priority
+baseurl=https://codecs.fedoraproject.org/openh264/$releasever/$basearch/debug/
+type=rpm
+enabled=0
+metadata_expire=28d
+repo_gpgcheck=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
diff --git a/fedora-modular.repo b/fedora-modular.repo
new file mode 100644
index 0000000..c058afe
--- /dev/null
+++ b/fedora-modular.repo
@@ -0,0 +1,38 @@
+[fedora-modular]
+name=Fedora Modular $releasever - $basearch
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/$basearch/os/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch
+enabled=0
+#metadata_expire=7d
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
+[fedora-modular-debuginfo]
+name=Fedora Modular $releasever - $basearch - Debug
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/$basearch/debug/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-debug-$releasever&arch=$basearch
+enabled=0
+metadata_expire=7d
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
+[fedora-modular-source]
+name=Fedora Modular $releasever - Source
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/source/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-source-$releasever&arch=$basearch
+enabled=0
+metadata_expire=7d
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
diff --git a/fedora-rawhide-modular.repo b/fedora-rawhide-modular.repo
new file mode 100644
index 0000000..ef16dad
--- /dev/null
+++ b/fedora-rawhide-modular.repo
@@ -0,0 +1,58 @@
+# These packages are untested and still under development. This
+# repository is used for development of new releases.
+#
+# This repository can see significant daily turnover and major
+# functionality changes which cause unexpected problems with other
+# development packages. Please use these packages if you want to work
+# with the Fedora developers by testing these new development packages.
+#
+# # https://admin.fedoraproject.org/mailman/listinfo/test (Subscription
+# Required) is available as a discussion forum for
+# testing and troubleshooting for development packages in conjunction
+# with new test releases.
+#
+# More information is available at http://fedoraproject.org/wiki/Testing 
+#
+# Reproducible and reportable issues should be filed at
+# http://bugzilla.redhat.com/.
+#
+# Product: Fedora
+# Version: rawhide-modular
+
+[rawhide-modular]
+name=Fedora - Modular Rawhide - Developmental packages for the next Fedora release
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Modular/$basearch/os/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular&arch=$basearch
+enabled=1
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
+[rawhide-modular-debuginfo]
+name=Fedora - Modular Rawhide - Debug
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Modular/$basearch/debug/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular-debug&arch=$basearch
+enabled=0
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
+[rawhide-modular-source]
+name=Fedora - Modular Rawhide - Source
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Modular/source/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular-source&arch=$basearch
+enabled=0
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
diff --git a/fedora-rawhide.repo b/fedora-rawhide.repo
new file mode 100644
index 0000000..33ce308
--- /dev/null
+++ b/fedora-rawhide.repo
@@ -0,0 +1,58 @@
+# These packages are untested and still under development. This
+# repository is used for development of new releases.
+#
+# This repository can see significant daily turnover and major
+# functionality changes which cause unexpected problems with other
+# development packages. Please use these packages if you want to work
+# with the Fedora developers by testing these new development packages.
+#
+# # https://admin.fedoraproject.org/mailman/listinfo/test (Subscription
+# Required) is available as a discussion forum for
+# testing and troubleshooting for development packages in conjunction
+# with new test releases.
+#
+# More information is available at http://fedoraproject.org/wiki/Testing 
+#
+# Reproducible and reportable issues should be filed at
+# http://bugzilla.redhat.com/.
+#
+# Product: Fedora
+# Version: rawhide
+
+[rawhide]
+name=Fedora - Rawhide - Developmental packages for the next Fedora release
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide//Everything/$basearch/os/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
+enabled=1
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
+[rawhide-debuginfo]
+name=Fedora - Rawhide - Debug
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/$basearch/debug/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-debug&arch=$basearch
+enabled=0
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
+[rawhide-source]
+name=Fedora - Rawhide - Source
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-source&arch=$basearch
+enabled=0
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
diff --git a/fedora-repos.spec b/fedora-repos.spec
index 60537d9..d100023 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,11 +1,10 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        29
-Release:        0.6%{?_module_build:%{?dist}}
+Release:        0.7%{?_module_build:%{?dist}}
 License:        MIT
-URL:            https://pagure.io/fedora-repos/
-# tarball is created by running make archive in the git checkout
-Source:         %{name}-%{version}.tar.bz2
+URL:            https://fedoraproject.org/
+
 Provides:       fedora-repos(%{version})
 Requires:       system-release(%{version})
 Requires:       fedora-repos-rawhide = %{version}-%{release}
@@ -15,6 +14,60 @@ Obsoletes:      fedora-repos-modular < 29-0.6
 Provides:       fedora-repos-modular = %{version}-%{release}
 BuildArch:      noarch
 
+Source1:        archmap
+Source2:        fedora.repo
+Source3:        fedora-updates.repo
+Source4:        fedora-updates-testing.repo
+Source5:        fedora-rawhide.repo
+Source6:        fedora-cisco-openh264.repo
+
+Source10:       RPM-GPG-KEY-fedora-7-primary
+Source11:       RPM-GPG-KEY-fedora-8-primary
+Source12:       RPM-GPG-KEY-fedora-8-primary-original
+Source13:       RPM-GPG-KEY-fedora-9-primary
+Source14:       RPM-GPG-KEY-fedora-9-primary-original
+Source15:       RPM-GPG-KEY-fedora-9-secondary
+Source16:       RPM-GPG-KEY-fedora-10-primary
+Source17:       RPM-GPG-KEY-fedora-11-primary
+Source18:       RPM-GPG-KEY-fedora-12-primary
+Source19:       RPM-GPG-KEY-fedora-13-primary
+Source20:       RPM-GPG-KEY-fedora-13-secondary
+Source21:       RPM-GPG-KEY-fedora-14-primary
+Source22:       RPM-GPG-KEY-fedora-14-secondary
+Source23:       RPM-GPG-KEY-fedora-15-primary
+Source24:       RPM-GPG-KEY-fedora-15-secondary
+Source25:       RPM-GPG-KEY-fedora-16-primary
+Source26:       RPM-GPG-KEY-fedora-16-secondary
+Source27:       RPM-GPG-KEY-fedora-17-primary
+Source28:       RPM-GPG-KEY-fedora-17-secondary
+Source29:       RPM-GPG-KEY-fedora-18-primary
+Source30:       RPM-GPG-KEY-fedora-18-secondary
+Source31:       RPM-GPG-KEY-fedora-19-primary
+Source32:       RPM-GPG-KEY-fedora-19-secondary
+Source33:       RPM-GPG-KEY-fedora-20-primary
+Source34:       RPM-GPG-KEY-fedora-20-secondary
+Source35:       RPM-GPG-KEY-fedora-21-primary
+Source36:       RPM-GPG-KEY-fedora-21-secondary
+Source37:       RPM-GPG-KEY-fedora-22-primary
+Source38:       RPM-GPG-KEY-fedora-22-secondary
+Source39:       RPM-GPG-KEY-fedora-23-primary
+Source40:       RPM-GPG-KEY-fedora-23-secondary
+Source41:       RPM-GPG-KEY-fedora-24-primary
+Source42:       RPM-GPG-KEY-fedora-24-secondary
+Source43:       RPM-GPG-KEY-fedora-25-primary
+Source44:       RPM-GPG-KEY-fedora-25-secondary
+Source45:       RPM-GPG-KEY-fedora-26-primary
+Source46:       RPM-GPG-KEY-fedora-26-secondary
+Source47:       RPM-GPG-KEY-fedora-27-primary
+Source48:       RPM-GPG-KEY-fedora-28-primary
+Source49:       RPM-GPG-KEY-fedora-29-primary
+
+Source100:      fedora-modular.repo
+Source101:      fedora-updates-modular.repo
+Source102:      fedora-updates-testing-modular.repo
+Source103:      fedora-rawhide-modular.repo
+Source104:      RPM-GPG-KEY-fedora-modularity
+
 %description
 Fedora package repository files for yum and dnf along with gpg public keys
 
@@ -38,14 +91,13 @@ This package provides the RPM signature keys.
 
 
 %prep
-%setup -q
 
 %build
 
 %install
 # Install the keys
 install -d -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-gpg
-install -m 644 RPM-GPG-KEY* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
+install -m 644 %{_sourcedir}/RPM-GPG-KEY* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
 
 # Link the primary/secondary keys to arch files, according to archmap.
 # Ex: if there's a key named RPM-GPG-KEY-fedora-19-primary, and archmap
@@ -54,7 +106,7 @@ install -m 644 RPM-GPG-KEY* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
 pushd $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
 for keyfile in RPM-GPG-KEY*; do
     key=${keyfile#RPM-GPG-KEY-} # e.g. 'fedora-20-primary'
-    arches=$(sed -ne "s/^${key}://p" $RPM_BUILD_DIR/%{name}-%{version}/archmap) \
+    arches=$(sed -ne "s/^${key}://p" %{_sourcedir}/archmap) \
         || echo "WARNING: no archmap entry for $key"
     for arch in $arches; do
         # replace last part with $arch (fedora-20-primary -> fedora-20-$arch)
@@ -66,7 +118,7 @@ ln -s RPM-GPG-KEY-fedora-%{version}-primary RPM-GPG-KEY-%{version}-fedora
 popd
 
 install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
-for file in fedora*repo ; do
+for file in %{_sourcedir}/fedora*repo ; do
   install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d
 done
 
@@ -89,10 +141,13 @@ done
 
 %files -n fedora-gpg-keys
 %dir /etc/pki/rpm-gpg
-/etc/pki/rpm-gpg/*
+/etc/pki/rpm-gpg/RPM-GPG-KEY-*
 
 
 %changelog
+* Wed Aug  8 2018 Peter Robinson <pbrobinson@fedoraproject.org> 29-0.7
+- Increment and build for source merge change
+
 * Tue Jul 31 2018 Stephen Gallagher <sgallagh@redhat.com> - 29-0.6
 - Merge modular repos into the main package
 - Part of https://fedoraproject.org/wiki/Changes/ModulesForEveryone
diff --git a/fedora-updates-modular.repo b/fedora-updates-modular.repo
new file mode 100644
index 0000000..c5b739f
--- /dev/null
+++ b/fedora-updates-modular.repo
@@ -0,0 +1,38 @@
+[updates-modular]
+name=Fedora Modular $releasever - $basearch - Updates
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/$basearch/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-f$releasever&arch=$basearch
+enabled=0
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+metadata_expire=6h
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
+[updates-modular-debuginfo]
+name=Fedora Modular $releasever - $basearch - Updates - Debug
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/$basearch/debug/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-debug-f$releasever&arch=$basearch
+enabled=0
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+metadata_expire=6h
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
+[updates-modular-source]
+name=Fedora Modular $releasever - Updates Source
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/SRPMS/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-source-f$releasever&arch=$basearch
+enabled=0
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+metadata_expire=6h
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
diff --git a/fedora-updates-testing-modular.repo b/fedora-updates-testing-modular.repo
new file mode 100644
index 0000000..e3169b5
--- /dev/null
+++ b/fedora-updates-testing-modular.repo
@@ -0,0 +1,38 @@
+[updates-testing-modular]
+name=Fedora Modular $releasever - $basearch - Test Updates
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/Modular/$basearch/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-f$releasever&arch=$basearch
+enabled=0
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+metadata_expire=6h
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
+[updates-testing-modular-debuginfo]
+name=Fedora Modular $releasever - $basearch - Test Updates Debug
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/$basearch/debug/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-debug-f$releasever&arch=$basearch
+enabled=0
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+metadata_expire=6h
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
+[updates-testing-modular-source]
+name=Fedora Modular $releasever - Test Updates Source
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/SRPMS/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-source-f$releasever&arch=$basearch
+enabled=0
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+metadata_expire=6h
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
diff --git a/fedora-updates-testing.repo b/fedora-updates-testing.repo
new file mode 100644
index 0000000..eacad41
--- /dev/null
+++ b/fedora-updates-testing.repo
@@ -0,0 +1,38 @@
+[updates-testing]
+name=Fedora $releasever - $basearch - Test Updates
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/Everything/$basearch/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
+enabled=0
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+metadata_expire=6h
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
+[updates-testing-debuginfo]
+name=Fedora $releasever - $basearch - Test Updates Debug
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/Everything/$basearch/debug/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch
+enabled=0
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+metadata_expire=6h
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
+[updates-testing-source]
+name=Fedora $releasever - Test Updates Source
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/Everything/SRPMS/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-source-f$releasever&arch=$basearch
+enabled=0
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+metadata_expire=6h
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
diff --git a/fedora-updates.repo b/fedora-updates.repo
new file mode 100644
index 0000000..144cdd3
--- /dev/null
+++ b/fedora-updates.repo
@@ -0,0 +1,38 @@
+[updates]
+name=Fedora $releasever - $basearch - Updates
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everything/$basearch/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
+enabled=0
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+metadata_expire=6h
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
+[updates-debuginfo]
+name=Fedora $releasever - $basearch - Updates - Debug
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everything/$basearch/debug/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch
+enabled=0
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+metadata_expire=6h
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
+[updates-source]
+name=Fedora $releasever - Updates Source
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everything/SRPMS/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch
+enabled=0
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+metadata_expire=6h
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
diff --git a/fedora.repo b/fedora.repo
new file mode 100644
index 0000000..0ef5db5
--- /dev/null
+++ b/fedora.repo
@@ -0,0 +1,38 @@
+[fedora]
+name=Fedora $releasever - $basearch
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
+enabled=0
+#metadata_expire=7d
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
+[fedora-debuginfo]
+name=Fedora $releasever - $basearch - Debug
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch
+enabled=0
+metadata_expire=7d
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
+[fedora-source]
+name=Fedora $releasever - Source
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/source/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch
+enabled=0
+metadata_expire=7d
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
diff --git a/sources b/sources
deleted file mode 100644
index 6e516dd..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (fedora-repos-29.tar.bz2) = 3086d45bc6531faf7912ff01a0d451a08b6b2a698c598784a72de48fbd4a2f33c4cbb890f181129420022815ccc6a1f65f94d5471e6ff28621c6f4c3ca949f00

From 992878248c0678ff679af3df8f09dfe829e535ed Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Sat, 11 Aug 2018 02:48:38 -0700
Subject: [PATCH 009/108] add f30 key

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 RPM-GPG-KEY-fedora-30-primary | 28 ++++++++++++++++++++++++++++
 fedora-repos.spec             |  1 +
 2 files changed, 29 insertions(+)
 create mode 100644 RPM-GPG-KEY-fedora-30-primary

diff --git a/RPM-GPG-KEY-fedora-30-primary b/RPM-GPG-KEY-fedora-30-primary
new file mode 100644
index 0000000..3af51a2
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-30-primary
@@ -0,0 +1,28 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFturGcBEACv0xBo91V2n0uEC2vh69ywCiSyvUgN/AQH8EZpCVtM7NyjKgKm
+bbY4G3R0M3ir1xXmvUDvK0493/qOiFrjkplvzXFTGpPTi0ypqGgxc5d0ohRA1M75
+L+0AIlXoOgHQ358/c4uO8X0JAA1NYxCkAW1KSJgFJ3RjukrfqSHWthS1d4o8fhHy
+KJKEnirE5hHqB50dafXrBfgZdaOs3C6ppRIePFe2o4vUEapMTCHFw0woQR8Ah4/R
+n7Z9G9Ln+0Cinmy0nbIDiZJ+pgLAXCOWBfDUzcOjDGKvcpoZharA07c0q1/5ojzO
+4F0Fh4g/BUmtrASwHfcIbjHyCSr1j/3Iz883iy07gJY5Yhiuaqmp0o0f9fgHkG53
+2xCU1owmACqaIBNQMukvXRDtB2GJMuKa/asTZDP6R5re+iXs7+s9ohcRRAKGyAyc
+YKIQKcaA+6M8T7/G+TPHZX6HJWqJJiYB+EC2ERblpvq9TPlLguEWcmvjbVc31nyq
+SDoO3ncFWKFmVsbQPTbP+pKUmlLfJwtb5XqxNR5GEXSwVv4I7IqBmJz1MmRafnBZ
+g0FJUtH668GnldO20XbnSVBr820F5SISMXVwCXDXEvGwwiB8Lt8PvqzXnGIFDAu3
+DlQI5sxSqpPVWSyw08ppKT2Tpmy8adiBotLfaCFl2VTHwOae48X2dMPBvQARAQAB
+tDFGZWRvcmEgKDMwKSA8ZmVkb3JhLTMwLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
+cmc+iQI4BBMBAgAiBQJbbqxnAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK
+CRDvPBEfz8ZZudTnD/9170LL3nyTVUCFmBjT9wZ4gYnpwtKVPa/pKnxbbS+Bmmac
+g9TrT9pZbqOHrNJLiZ3Zx1Hp+8uxr3Lo6kbYwImLhkOEDrf4aP17HfQ6VYFbQZI8
+f79OFxWJ7si9+3gfzeh9UYFEqOQfzIjLWFyfnas0OnV/P+RMQ1Zr+vPRqO7AR2va
+N9wg+Xl7157dhXPCGYnGMNSoxCbpRs0JNlzvJMuAea5nTTznRaJZtK/xKsqLn51D
+K07k9MHVFXakOH8QtMCUglbwfTfIpO5YRq5imxlWbqsYWVQy1WGJFyW6hWC0+RcJ
+Ox5zGtOfi4/dN+xJ+ibnbyvy/il7Qm+vyFhCYqIPyS5m2UVJUuao3eApE38k78/o
+8aQOTnFQZ+U1Sw+6woFTxjqRQBXlQm2+7Bt3bqGATg4sXXWPbmwdL87Ic+mxn/ml
+SMfQux/5k6iAu1kQhwkO2YJn9eII6HIPkW+2m5N1JsUyJQe4cbtZE5Yh3TRA0dm7
++zoBRfCXkOW4krchbgww/ptVmzMMP7GINJdROrJnsGl5FVeid9qHzV7aZycWSma7
+CxBYB1J8HCbty5NjtD6XMYRrMLxXugvX6Q4NPPH+2NKjzX4SIDejS6JjgrP3KA3O
+pMuo7ZHMfveBngv8yP+ZD/1sS6l+dfExvdaJdOdgFCnp4p3gPbw5+Lv70HrMjA==
+=BfZ/
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/fedora-repos.spec b/fedora-repos.spec
index d100023..4b81e43 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -61,6 +61,7 @@ Source46:       RPM-GPG-KEY-fedora-26-secondary
 Source47:       RPM-GPG-KEY-fedora-27-primary
 Source48:       RPM-GPG-KEY-fedora-28-primary
 Source49:       RPM-GPG-KEY-fedora-29-primary
+Source50:       RPM-GPG-KEY-fedora-30-primary
 
 Source100:      fedora-modular.repo
 Source101:      fedora-updates-modular.repo

From dcd53fbbb5f9bb92c11f356c222ed656ac47ba44 Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@bhujji.com>
Date: Tue, 14 Aug 2018 14:04:53 -0400
Subject: [PATCH 010/108] Setup for rawhide being f30

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
---
 archmap           |  2 ++
 fedora-repos.spec | 27 ++++-----------------------
 2 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/archmap b/archmap
index b78f7f4..51b9687 100644
--- a/archmap
+++ b/archmap
@@ -58,3 +58,5 @@ fedora-27-primary: i386 x86_64 armhfp aarch64 ppc64 ppc64le s390x
 fedora-28-primary: i386 x86_64 armhfp aarch64 ppc64 ppc64le s390x
 
 fedora-29-primary: i386 x86_64 armhfp aarch64 ppc64 ppc64le s390x
+
+fedora-30-primary: i386 x86_64 armhfp aarch64 ppc64le s390x
diff --git a/fedora-repos.spec b/fedora-repos.spec
index 4b81e43..8ffc95a 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,7 +1,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
-Version:        29
-Release:        0.7%{?_module_build:%{?dist}}
+Version:        30
+Release:        0.1%{?_module_build:%{?dist}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -146,24 +146,5 @@ done
 
 
 %changelog
-* Wed Aug  8 2018 Peter Robinson <pbrobinson@fedoraproject.org> 29-0.7
-- Increment and build for source merge change
-
-* Tue Jul 31 2018 Stephen Gallagher <sgallagh@redhat.com> - 29-0.6
-- Merge modular repos into the main package
-- Part of https://fedoraproject.org/wiki/Changes/ModulesForEveryone
-
-* Fri May 18 2018 Mohan Boddu <mboddu@redhat.com> - 29-0.5
-- Baseurl fixes
-
-* Mon Mar 12 2018 Stephen Gallagher <sgallagh@redhat.com> - 29-0.4
-- Move modular repos to a subpackage
-
-* Sat Mar 10 2018 Dennis Gilmore <dennis@ausil.us> - 29-0.3
-- fix up the baseurls in updates-testing
-
-* Sat Feb 24 2018 Dennis Gilmore <dennis@ausil.us> - 29-0.2
-- add changes for the new modular setup
-
-* Mon Feb 19 2018 Mohan Boddu <mboddu@redhat.com> - 29-0.1
-- Setup for rawhide being f29
+* Tue Aug 14 2018 Mohan Boddu <mboddu@bhujji.com> - 30-0.1
+- Setup for rawhide being f30

From e733dba4cb04f04050443b139227b55368462f40 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Tue, 2 Oct 2018 11:18:23 +0100
Subject: [PATCH 011/108] Enable the skip if unavailable for the cisco-openh264
 repo

With the cisco-openh264 being a baseurl and not mirroed if the repo
is unavailable all updates fail. We should enable users to get all
the standard Fedora updates if for some reason this repo is not working
which at times is out of the Fedora infra team's control.

Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
---
 fedora-cisco-openh264.repo | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fedora-cisco-openh264.repo b/fedora-cisco-openh264.repo
index 7b29acc..eecdfc5 100644
--- a/fedora-cisco-openh264.repo
+++ b/fedora-cisco-openh264.repo
@@ -8,7 +8,7 @@ metadata_expire=14d
 repo_gpgcheck=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
+skip_if_unavailable=True
 
 [fedora-cisco-openh264-debuginfo]
 name=Fedora $releasever openh264 (From Cisco) - $basearch - Debug
@@ -20,5 +20,5 @@ metadata_expire=28d
 repo_gpgcheck=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
+skip_if_unavailable=True
 

From c66776fc09d962ff14357721c79a899175325d60 Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@bhujji.com>
Date: Tue, 13 Nov 2018 14:58:16 -0500
Subject: [PATCH 012/108] Adding fedora-iot-2019 key

Also, adding the changelog for enabling
skip_if_unavailable for cisco-openh264 repo

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
---
 RPM-GPG-KEY-fedora-iot-2019 | 29 +++++++++++++++++++++++++++++
 archmap                     |  2 ++
 fedora-repos.spec           |  8 +++++++-
 3 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 RPM-GPG-KEY-fedora-iot-2019

diff --git a/RPM-GPG-KEY-fedora-iot-2019 b/RPM-GPG-KEY-fedora-iot-2019
new file mode 100644
index 0000000..8218fa5
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-iot-2019
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFvrElgBEACjNft3anFHNzwHW6dzxGinWEzFin3xBUjhre7e23DgDRIceDte
+POqXGnIN5yGGH4VZrEGHfjTPoCcrRSpM75ryPLa3Pi0UHXRso/OkO2ta+VaQRlwU
+2WAYqd3g/eck+x7MZHuKKyfyxDSUywuJumWhIqeJLyG/J9e1riHwaxYwtLDvHCAt
+K4osoJ6GZDx95Rr4El/N5CtZBlIzRQUJMo695MIxeKA6RmlQVp8mGPQm20Hveo0k
+BsLYFJxTW4D+KnwpQr2mJLsEQnCgKcr8TF5hDowz8+o3wdUrfteiVfkdX64kXJm8
+5jaR/K0ubnv96iTxoeh2Wf2jNAn3EjKhPzEeYFI2gCm2tzwUEzSuOjtrx7FqDp7/
+iJRANmKQJ9KzhCT5JLkeS5do8d196xiI79Zlx8ISQRvCNuu1Or7idwvIgHy/+BCy
+PUARv430YvXU4d01FVKTlNrbRsq91SVojek4UXkAk9oh4d3Y/AQF1DLs4nK1vBuk
+wWIKwcfVA/RidSqXofx6pahTPvguTkAARhMEJPLtbQBzD5kqkdgdP/6s7ziTwGkG
+O8iF0TvkCwMXWXHl1B/m6b3h/wWOIFNfAZ0FxZmmD5UhytjVjhdI7jiyZf6JjNup
+VCVx1eqMGZfm3jkZqzWOB9wrVrb6rtI25ZuoRQJ/idnXkxZmq4m1MCZbCQARAQAB
+tDVGZWRvcmEgKGlvdCAyMDE5KSA8ZmVkb3JhLWlvdC0yMDE5QGZlZG9yYXByb2pl
+Y3Qub3JnPokCPgQTAQIAKAUCW+sSWAIbDwUJEw5BKAYLCQgHAwIGFQgCCQoLBBYC
+AwECHgECF4AACgkQe7kHItu9z3xs8Q/9HqL76vo5xZjl78USwgX7t2f8Aa6sqD6O
+IV4V9KPCaNeqP8OF6LqYFxkv3GX3FMHGPHVKOBLQ6LvuGozcnnpZ3ypq6ChAy2L4
+W7ytFggpluArxSN5jmHoOXO51wPDPCSjd4rRi1+XnMDiA3VIk0vTcGHUK13Jgvzu
+UrIbFYhVwwCn8Rt0GvCWVLyvKRbykN3xgFmromREKdDCUymYS/u4hXw5xQt2AE9I
+gX9puLlGH5AdbJumMipcaI9erH/KVoBvtAHA5ozkL0PDocRaWA/W+i8rXEeI8TJB
+A7Q/Xb/L12aIOCzeyEKGP911iR3/99UGMgfswKvF4WT4KdAV2VZoPizu0Am2MUYh
+oexdnHY6GtU1UKcWt2hW7HmGBCZVdVpUF3W/gebe+ahLPT9UhqNTin2vw7MxMKy2
+uWPZri76R165F3TP434dZLNfkNa1rdtQrRaD1Be9/hAQthYWKoCFowbMLAr1Bgzk
+Us97arxBTzqkr9GTCy5CX+nObIbwkrFYugRfA4bSzNFSpCo71cudqNwKJEw65lF9
+0+T5ma7lM6ZwijH1A9pYeGQS0eUOrV/0VTsxXQOyS6Mcfper+dkOpypZdSnJGzid
+9HPUSUdjI94wtRYInrcD09v5OnJcoxUDVVjVhH4FIqKVYstucn/LB67nnn+55uTO
+Kdm729ex0UI=
+=vzvx
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/archmap b/archmap
index 51b9687..34e94c9 100644
--- a/archmap
+++ b/archmap
@@ -60,3 +60,5 @@ fedora-28-primary: i386 x86_64 armhfp aarch64 ppc64 ppc64le s390x
 fedora-29-primary: i386 x86_64 armhfp aarch64 ppc64 ppc64le s390x
 
 fedora-30-primary: i386 x86_64 armhfp aarch64 ppc64le s390x
+
+fedora-iot-2019: i386 x86_64 armhfp aarch64 ppc64le s390x
diff --git a/fedora-repos.spec b/fedora-repos.spec
index 8ffc95a..ed2c5c2 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,7 +1,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        30
-Release:        0.1%{?_module_build:%{?dist}}
+Release:        0.2%{?_module_build:%{?dist}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -69,6 +69,8 @@ Source102:      fedora-updates-testing-modular.repo
 Source103:      fedora-rawhide-modular.repo
 Source104:      RPM-GPG-KEY-fedora-modularity
 
+Source150:      RPM-GPG-KEY-fedora-iot-2019
+
 %description
 Fedora package repository files for yum and dnf along with gpg public keys
 
@@ -146,5 +148,9 @@ done
 
 
 %changelog
+* Tue Nov 13 2018 Mohan Boddu <mboddu@bhujji.com> - 30-0.2
+- Adding fedora-iot-2019 key
+- Enable skip_if_unavailable for cisco-openh264 repo
+
 * Tue Aug 14 2018 Mohan Boddu <mboddu@bhujji.com> - 30-0.1
 - Setup for rawhide being f30

From 82530f895c7beeea4f1453872cb50b77b1db6582 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Sat, 5 Jan 2019 12:24:13 -0800
Subject: [PATCH 013/108] Add fedora-7-primary to archmap so it properly makes
 links.

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1531957

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 archmap           | 2 ++
 fedora-repos.spec | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/archmap b/archmap
index 34e94c9..c11e58b 100644
--- a/archmap
+++ b/archmap
@@ -1,3 +1,5 @@
+fedora-7-primary: i386 x86_64 ppc ppc64
+
 fedora-8-primary: i386 x86_64 ppc ppc64
 
 fedora-9-primary: i386 x86_64 ppc ppc64
diff --git a/fedora-repos.spec b/fedora-repos.spec
index ed2c5c2..ab7090f 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,7 +1,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        30
-Release:        0.2%{?_module_build:%{?dist}}
+Release:        0.3%{?_module_build:%{?dist}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -148,6 +148,9 @@ done
 
 
 %changelog
+* Sat Jan 05 2019 Kevin Fenzi <kevin@scrye.com> - 30-0.3}
+- Add fedora-7-primary to archmap. Fixes bug #1531957
+
 * Tue Nov 13 2018 Mohan Boddu <mboddu@bhujji.com> - 30-0.2
 - Adding fedora-iot-2019 key
 - Enable skip_if_unavailable for cisco-openh264 repo

From 52f903d59917f54596a258cfe7672148b84da82f Mon Sep 17 00:00:00 2001
From: Florian H <emailtoflorian@gmail.com>
Date: Wed, 28 Nov 2018 11:47:38 -0500
Subject: [PATCH 014/108] Signed-off-by: Florian H <emailtoflorian@gmail.com>
 removed failovermethod option in repos.

---
 fedora-cisco-openh264.repo          | 1 -
 fedora-modular.repo                 | 3 ---
 fedora-rawhide-modular.repo         | 3 ---
 fedora-rawhide.repo                 | 3 ---
 fedora-updates-testing-modular.repo | 3 ---
 fedora-updates-testing.repo         | 3 ---
 fedora-updates.repo                 | 3 ---
 fedora.repo                         | 3 ---
 8 files changed, 22 deletions(-)

diff --git a/fedora-cisco-openh264.repo b/fedora-cisco-openh264.repo
index eecdfc5..32a3241 100644
--- a/fedora-cisco-openh264.repo
+++ b/fedora-cisco-openh264.repo
@@ -12,7 +12,6 @@ skip_if_unavailable=True
 
 [fedora-cisco-openh264-debuginfo]
 name=Fedora $releasever openh264 (From Cisco) - $basearch - Debug
-failovermethod=priority
 baseurl=https://codecs.fedoraproject.org/openh264/$releasever/$basearch/debug/
 type=rpm
 enabled=0
diff --git a/fedora-modular.repo b/fedora-modular.repo
index c058afe..46f78e6 100644
--- a/fedora-modular.repo
+++ b/fedora-modular.repo
@@ -1,6 +1,5 @@
 [fedora-modular]
 name=Fedora Modular $releasever - $basearch
-failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/$basearch/os/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch
 enabled=0
@@ -13,7 +12,6 @@ skip_if_unavailable=False
 
 [fedora-modular-debuginfo]
 name=Fedora Modular $releasever - $basearch - Debug
-failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/$basearch/debug/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-debug-$releasever&arch=$basearch
 enabled=0
@@ -26,7 +24,6 @@ skip_if_unavailable=False
 
 [fedora-modular-source]
 name=Fedora Modular $releasever - Source
-failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/source/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-source-$releasever&arch=$basearch
 enabled=0
diff --git a/fedora-rawhide-modular.repo b/fedora-rawhide-modular.repo
index ef16dad..9d0a63c 100644
--- a/fedora-rawhide-modular.repo
+++ b/fedora-rawhide-modular.repo
@@ -21,7 +21,6 @@
 
 [rawhide-modular]
 name=Fedora - Modular Rawhide - Developmental packages for the next Fedora release
-failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Modular/$basearch/os/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular&arch=$basearch
 enabled=1
@@ -34,7 +33,6 @@ skip_if_unavailable=False
 
 [rawhide-modular-debuginfo]
 name=Fedora - Modular Rawhide - Debug
-failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Modular/$basearch/debug/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular-debug&arch=$basearch
 enabled=0
@@ -46,7 +44,6 @@ skip_if_unavailable=False
 
 [rawhide-modular-source]
 name=Fedora - Modular Rawhide - Source
-failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Modular/source/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular-source&arch=$basearch
 enabled=0
diff --git a/fedora-rawhide.repo b/fedora-rawhide.repo
index 33ce308..445b5da 100644
--- a/fedora-rawhide.repo
+++ b/fedora-rawhide.repo
@@ -21,7 +21,6 @@
 
 [rawhide]
 name=Fedora - Rawhide - Developmental packages for the next Fedora release
-failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide//Everything/$basearch/os/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
 enabled=1
@@ -34,7 +33,6 @@ skip_if_unavailable=False
 
 [rawhide-debuginfo]
 name=Fedora - Rawhide - Debug
-failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/$basearch/debug/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-debug&arch=$basearch
 enabled=0
@@ -46,7 +44,6 @@ skip_if_unavailable=False
 
 [rawhide-source]
 name=Fedora - Rawhide - Source
-failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-source&arch=$basearch
 enabled=0
diff --git a/fedora-updates-testing-modular.repo b/fedora-updates-testing-modular.repo
index e3169b5..2be7ad0 100644
--- a/fedora-updates-testing-modular.repo
+++ b/fedora-updates-testing-modular.repo
@@ -1,6 +1,5 @@
 [updates-testing-modular]
 name=Fedora Modular $releasever - $basearch - Test Updates
-failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/Modular/$basearch/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-f$releasever&arch=$basearch
 enabled=0
@@ -13,7 +12,6 @@ skip_if_unavailable=False
 
 [updates-testing-modular-debuginfo]
 name=Fedora Modular $releasever - $basearch - Test Updates Debug
-failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/$basearch/debug/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-debug-f$releasever&arch=$basearch
 enabled=0
@@ -26,7 +24,6 @@ skip_if_unavailable=False
 
 [updates-testing-modular-source]
 name=Fedora Modular $releasever - Test Updates Source
-failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/SRPMS/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-source-f$releasever&arch=$basearch
 enabled=0
diff --git a/fedora-updates-testing.repo b/fedora-updates-testing.repo
index eacad41..21e0812 100644
--- a/fedora-updates-testing.repo
+++ b/fedora-updates-testing.repo
@@ -1,6 +1,5 @@
 [updates-testing]
 name=Fedora $releasever - $basearch - Test Updates
-failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/Everything/$basearch/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
 enabled=0
@@ -13,7 +12,6 @@ skip_if_unavailable=False
 
 [updates-testing-debuginfo]
 name=Fedora $releasever - $basearch - Test Updates Debug
-failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/Everything/$basearch/debug/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch
 enabled=0
@@ -26,7 +24,6 @@ skip_if_unavailable=False
 
 [updates-testing-source]
 name=Fedora $releasever - Test Updates Source
-failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/Everything/SRPMS/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-source-f$releasever&arch=$basearch
 enabled=0
diff --git a/fedora-updates.repo b/fedora-updates.repo
index 144cdd3..4d5812a 100644
--- a/fedora-updates.repo
+++ b/fedora-updates.repo
@@ -1,6 +1,5 @@
 [updates]
 name=Fedora $releasever - $basearch - Updates
-failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everything/$basearch/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
 enabled=0
@@ -13,7 +12,6 @@ skip_if_unavailable=False
 
 [updates-debuginfo]
 name=Fedora $releasever - $basearch - Updates - Debug
-failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everything/$basearch/debug/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch
 enabled=0
@@ -26,7 +24,6 @@ skip_if_unavailable=False
 
 [updates-source]
 name=Fedora $releasever - Updates Source
-failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everything/SRPMS/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch
 enabled=0
diff --git a/fedora.repo b/fedora.repo
index 0ef5db5..faf643e 100644
--- a/fedora.repo
+++ b/fedora.repo
@@ -1,6 +1,5 @@
 [fedora]
 name=Fedora $releasever - $basearch
-failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
 enabled=0
@@ -13,7 +12,6 @@ skip_if_unavailable=False
 
 [fedora-debuginfo]
 name=Fedora $releasever - $basearch - Debug
-failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch
 enabled=0
@@ -26,7 +24,6 @@ skip_if_unavailable=False
 
 [fedora-source]
 name=Fedora $releasever - Source
-failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/source/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch
 enabled=0

From 78cf06f164ff37233a60a33e8fd4d6e9ca4660c4 Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@bhujji.com>
Date: Mon, 18 Feb 2019 13:10:13 -0500
Subject: [PATCH 015/108] Adding changelog for removing failovermethod option
 in repos

https://src.fedoraproject.org/rpms/fedora-repos/pull-request/19

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
---
 fedora-repos.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index ab7090f..93fd73b 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -148,8 +148,9 @@ done
 
 
 %changelog
-* Sat Jan 05 2019 Kevin Fenzi <kevin@scrye.com> - 30-0.3}
+* Sat Jan 05 2019 Kevin Fenzi <kevin@scrye.com> - 30-0.3
 - Add fedora-7-primary to archmap. Fixes bug #1531957
+- Remove failovermethod option in repos (augenauf(Florian H))
 
 * Tue Nov 13 2018 Mohan Boddu <mboddu@bhujji.com> - 30-0.2
 - Adding fedora-iot-2019 key

From 81ae6bcd584818d890f7939658884c5c9ec2e85c Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@bhujji.com>
Date: Mon, 18 Feb 2019 13:22:44 -0500
Subject: [PATCH 016/108] Adding F31 key

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
---
 RPM-GPG-KEY-fedora-31-primary | 29 +++++++++++++++++++++++++++++
 fedora-repos.spec             |  6 +++++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 RPM-GPG-KEY-fedora-31-primary

diff --git a/RPM-GPG-KEY-fedora-31-primary b/RPM-GPG-KEY-fedora-31-primary
new file mode 100644
index 0000000..9cbdd5a
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-31-primary
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFxq3QMBEADUhGfCfP1ijiggBuVbR/pBDSWMC3TWbfC8pt7fhZkYrilzfWUM
+fTsikPymSriScONXP6DNyZ5r7tgrIVdVrJvRIqIFRO0mufp9HyfWKDO//Ctyp7OQ
+zYw6NVthO/aWpyFfJpj6s4iZsYGqf9gByV8brBB8v8jEsCtVOj1BU3bMbLkMsRI9
++WiLjDYyvopqNBQuIe8ogxSxpYdbUz6+jxzfvhRoBzWdjITd//Gjd90kkrBOMWkO
+LTqO133OD1WMT08G5NuQ4KhjYsVvSbBpfdkTcNuP8gBP9LxCQDc+e1eAhZ95g3qk
+XLeKEK9j+F+wuG/OrEAxBsscCxXRUB38QH6CFe3UxGoSMnBi+jEhicudo+ItpFOy
+7rPaYyRh4Pmu4QHcC83bNjp8NI6zTHrBmVuPqkxMn07GMAQav9ezBXj6umqTX4cU
+dsJUavJrJ3u7rT0lhBdiGrQ9zPbL07u2Kn+OXPAC3dKSf7G8TvwNAdry9esGSpi3
+8aa1myQYVZvAlsIBkbN3fb1wvDJE5czVhzwQ77V2t66jxeg0o9/2OZVH3CozD2Zj
+v28LHuW/jnQHtsQ0fUyQYRmHxNEVkW10GGM7fQwxzpxFFS1O/2XEnfMu7yBHZsgL
+SojfUct0FhLhEN/g/IINX9ZCVrzK5/De27CNjYE1cgYD/lTmQ0SyjfKVwwARAQAB
+tDFGZWRvcmEgKDMxKSA8ZmVkb3JhLTMxLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
+cmc+iQI+BBMBAgAoAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAUCXGrkTQUJ
+Es8P/QAKCRBQyzkLPDNZxBmDD/90IFwAfFcQq5ENl7/o2CYQ9k2adTHbV5RoIOWC
+/o9I5/btn1y8WDhPOUNmsgbUqRqz6srlVplg+LkpIj67PVLDBwpVbCJC8o1fztd2
+MryVqdvu562WVhUorII+iW7nfqD0yv55nH9b/JR1qloUa8LpeKw84JgvxF5wVfyR
+id1WjI0DBk2taFR4xCfU5Tb262fbdFj5iB9xskP7oNeS29+SfDjlnybtlFoqr9UA
+nY1uvhBPkGmj45SJkpfP+L+kGYXVaUd29M/q/Pt46X1KDvr6Z0l8bSUEk3zfcNdj
+uEhtHBqSy1UPPAikGX1Q5wGdu7R7+mv/ARqfI6OC44ipoOMNK1Aiu6+slbPYphwX
+ighSz9yYuG0EdWt7akfKR0R04Kuej4LXLWcxTR4l8XDzThYgPP0g+z0XQJrAkVhi
+SrzICeC3K1GPSiUtNAxSTL+qWWgwvQyAPNoPV/OYmY+wUxUnKCZpEWPkL79lh6CM
+bJx/zlrOMzRumSzaOnKW9AOliviH4Rj89OmDifBEsQ0CewdHN9ly6g4ZFJJGYXJ5
+HTb5jdButTC3tDfvH8Z7dtXKdC4iqJCIxj698Xn8UjVefZQ2nbv5eXcZLfHtvbNB
+TTv1vvBV4G7aiHKYRSj7HmxhLBZC8Y/nmFAemOoOYDpR5eUmPmSbFayoLfRsFXmC
+HLs7cw==
+=6hRW
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/fedora-repos.spec b/fedora-repos.spec
index 93fd73b..80c1524 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,7 +1,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        30
-Release:        0.3%{?_module_build:%{?dist}}
+Release:        0.4%{?_module_build:%{?dist}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -62,6 +62,7 @@ Source47:       RPM-GPG-KEY-fedora-27-primary
 Source48:       RPM-GPG-KEY-fedora-28-primary
 Source49:       RPM-GPG-KEY-fedora-29-primary
 Source50:       RPM-GPG-KEY-fedora-30-primary
+Source51:       RPM-GPG-KEY-fedora-31-primary
 
 Source100:      fedora-modular.repo
 Source101:      fedora-updates-modular.repo
@@ -148,6 +149,9 @@ done
 
 
 %changelog
+* Mon Feb 18 2019 Mohan Boddu <mboddu@bhujji.com> - 30-0.4
+- Adding F31 key
+
 * Sat Jan 05 2019 Kevin Fenzi <kevin@scrye.com> - 30-0.3
 - Add fedora-7-primary to archmap. Fixes bug #1531957
 - Remove failovermethod option in repos (augenauf(Florian H))

From 8a02be3b7e05864aa88a65713a0dc7a44e995bef Mon Sep 17 00:00:00 2001
From: Tomas Hrcka <thrcka@redhat.com>
Date: Tue, 19 Feb 2019 14:22:31 +0100
Subject: [PATCH 017/108] Rawhide being f31

Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
---
 archmap           | 2 ++
 fedora-repos.spec | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/archmap b/archmap
index c11e58b..6ba1a9c 100644
--- a/archmap
+++ b/archmap
@@ -64,3 +64,5 @@ fedora-29-primary: i386 x86_64 armhfp aarch64 ppc64 ppc64le s390x
 fedora-30-primary: i386 x86_64 armhfp aarch64 ppc64le s390x
 
 fedora-iot-2019: i386 x86_64 armhfp aarch64 ppc64le s390x
+
+fedora-31-primary: i386 x86_64 armhfp aarch64 ppc64le s390x
diff --git a/fedora-repos.spec b/fedora-repos.spec
index 80c1524..5d8dc5c 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,7 +1,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
-Version:        30
-Release:        0.4%{?_module_build:%{?dist}}
+Version:        31
+Release:        0.1%{?_module_build:%{?dist}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -149,6 +149,9 @@ done
 
 
 %changelog
+* Tue Feb 19 2019 Tomas Hrcka <thrcka@redhat.com> - 31-0.1
+- Setup for rawhide being f31
+
 * Mon Feb 18 2019 Mohan Boddu <mboddu@bhujji.com> - 30-0.4
 - Adding F31 key
 

From 6efa142e97a20bd820bac5fbd0127445d733b579 Mon Sep 17 00:00:00 2001
From: Sinny Kumari <sinny@redhat.com>
Date: Thu, 7 Mar 2019 16:04:30 +0530
Subject: [PATCH 018/108] Create fedora-repos-ostree sub-package

Related- https://github.com/coreos/fedora-coreos-tracker/issues/143

Signed-off-by: Sinny Kumari <sinny@redhat.com>
---
 fedora-repos.spec | 22 +++++++++++++++++++++-
 fedora.conf       |  5 +++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 fedora.conf

diff --git a/fedora-repos.spec b/fedora-repos.spec
index 5d8dc5c..0525c99 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,7 +1,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        31
-Release:        0.1%{?_module_build:%{?dist}}
+Release:        0.2%{?_module_build:%{?dist}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -71,6 +71,7 @@ Source103:      fedora-rawhide-modular.repo
 Source104:      RPM-GPG-KEY-fedora-modularity
 
 Source150:      RPM-GPG-KEY-fedora-iot-2019
+Source151:      fedora.conf
 
 %description
 Fedora package repository files for yum and dnf along with gpg public keys
@@ -94,6 +95,15 @@ Obsoletes:      fedora-release-rawhide <= 22-0.3
 This package provides the RPM signature keys.
 
 
+%package ostree
+Summary:        OSTree specific files
+
+%description ostree
+This package provides ostree specfic files like remote config from
+where client's system will pull OSTree updates.
+
+
+
 %prep
 
 %build
@@ -126,6 +136,9 @@ for file in %{_sourcedir}/fedora*repo ; do
   install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d
 done
 
+# Install ostree remote config
+install -d -m 755 $RPM_BUILD_ROOT/etc/ostree/remotes.d/
+install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/
 
 %files
 %dir /etc/yum.repos.d
@@ -148,7 +161,14 @@ done
 /etc/pki/rpm-gpg/RPM-GPG-KEY-*
 
 
+%files ostree
+%dir /etc/ostree/remotes.d/
+/etc/ostree/remotes.d/fedora.conf
+
 %changelog
+* Thu Mar 07 2019 Sinny Kumari <skumari@redhat.com> - 31-0.2
+- Create fedora-repos-ostree sub-package
+
 * Tue Feb 19 2019 Tomas Hrcka <thrcka@redhat.com> - 31-0.1
 - Setup for rawhide being f31
 
diff --git a/fedora.conf b/fedora.conf
new file mode 100644
index 0000000..3d23f22
--- /dev/null
+++ b/fedora.conf
@@ -0,0 +1,5 @@
+[remote "fedora"]
+url=https://ostree.fedoraproject.org
+gpg-verify=true
+gpgkeypath=/etc/pki/rpm-gpg/
+contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist

From 7fe18642e83021bdb27698512d2401ba54a6e9ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Date: Tue, 12 Mar 2019 12:39:16 +0100
Subject: [PATCH 019/108] Allow to use newer GPG keys, so Rawhide can be
 updated after branch.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently, the GPG keys have to be updated together with repositories.
But there is no strong relationship between them. After branching, there
has has to be possible to update GPG keys independently, otherwise, it
is not possible to keep updating Rawhide without usign --nogpgcheck or
different "cheating".

Original discussion of fedora-devel:

https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/MFX2JDVANNEW7LWWIBBLYCN6DEPWHSXF/

Signed-off-by: Vít Ondruch <vondruch@redhat.com>
---
 fedora-repos.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index 0525c99..a82e2a2 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,14 +1,14 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        31
-Release:        0.2%{?_module_build:%{?dist}}
+Release:        0.3%{?_module_build:%{?dist}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
 Provides:       fedora-repos(%{version})
 Requires:       system-release(%{version})
 Requires:       fedora-repos-rawhide = %{version}-%{release}
-Requires:       fedora-gpg-keys = %{version}-%{release}
+Requires:       fedora-gpg-keys >= %{version}-%{release}
 Obsoletes:      fedora-repos-anaconda < 22-0.3
 Obsoletes:      fedora-repos-modular < 29-0.6
 Provides:       fedora-repos-modular = %{version}-%{release}
@@ -166,6 +166,9 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/
 /etc/ostree/remotes.d/fedora.conf
 
 %changelog
+* Tue Mar 12 2019 Vít Ondruch <vondruch@redhat.com> - 31-0.3
+- Allow to use newer GPG keys, so Rawhide can be updated after branch.
+
 * Thu Mar 07 2019 Sinny Kumari <skumari@redhat.com> - 31-0.2
 - Create fedora-repos-ostree sub-package
 

From e5d8ab410f4809510af252924a872d9a29bea0d9 Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@bhujji.com>
Date: Tue, 13 Aug 2019 04:58:40 -0400
Subject: [PATCH 020/108] Setup for rawhide being f31

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
---
 RPM-GPG-KEY-fedora-32-primary | 28 ++++++++++++++++++++++++++++
 archmap                       |  2 ++
 fedora-repos.spec             |  9 +++++++--
 3 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 RPM-GPG-KEY-fedora-32-primary

diff --git a/RPM-GPG-KEY-fedora-32-primary b/RPM-GPG-KEY-fedora-32-primary
new file mode 100644
index 0000000..cd0bd04
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-32-primary
@@ -0,0 +1,28 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----  
+
+mQINBF1RVqsBEADWMBqYv/G1r4PwyiPQCfg5fXFGXV1FCZ32qMi9gLUTv1CX7rYy
+H4Inj93oic+lt1kQ0kQCkINOwQczOkm6XDkEekmMrHknJpFLwrTK4AS28bYF2RjL
+M+QJ/dGXDMPYsP0tkLvoxaHr9WTRq89A+AmONcUAQIMJg3JxXAAafBi2UszUUEPI
+U35MyufFt2ePd1k/6hVAO8S2VT72TxXSY7Ha4X2J0pGzbqQ6Dq3AVzogsnoIi09A
+7fYutYZPVVAEGRUqavl0th8LyuZShASZ38CdAHBMvWV4bVZghd/wDV5ev3LXUE0o
+itLAqNSeiDJ3grKWN6v0qdU0l3Ya60sugABd3xaE+ROe8kDCy3WmAaO51Q880ZA2
+iXOTJFObqkBTP9j9+ZeQ+KNE8SBoiH1EybKtBU8HmygZvu8ZC1TKUyL5gwGUJt8v
+ergy5Bw3Q7av520sNGD3cIWr4fBAVYwdBoZT8RcsnU1PP67NmOGFcwSFJ/LpiOMC
+pZ1IBvjOC7KyKEZY2/63kjW73mB7OHOd18BHtGVkA3QAdVlcSule/z68VOAy6bih
+E6mdxP28D4INsts8w6yr4G+3aEIN8u0qRQq66Ri5mOXTyle+ONudtfGg3U9lgicg
+z6oVk17RT0jV9uL6K41sGZ1sH/6yTXQKagdAYr3w1ix2L46JgzC+/+6SSwARAQAB
+tDFGZWRvcmEgKDMyKSA8ZmVkb3JhLTMyLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
+cmc+iQI4BBMBAgAiBQJdUVarAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK
+CRBsEwJtEslE0LdAD/wKdAMtfzr7O2y06/sOPnrb3D39Y2DXbB8y0iEmRdBL29Bq
+5btxwmAka7JZRJVFxPsOVqZ6KARjS0/oCBmJc0jCRANFCtM4UjVHTSsxrJfuPkel
+vrlNE9tcR6OCRpuj/PZgUa39iifF/FTUfDgh4Q91xiQoLqfBxOJzravQHoK9VzrM
+NTOu6J6l4zeGzY/ocj6DpT+5fdUO/3HgGFNiNYPC6GVzeiA3AAVR0sCyGENuqqdg
+wUxV3BIht05M5Wcdvxg1U9x5I3yjkLQw+idvX4pevTiCh9/0u+4g80cT/21Cxsdx
+7+DVHaewXbF87QQIcOAing0S5QE67r2uPVxmWy/56TKUqDoyP8SNsV62lT2jutsj
+LevNxUky011g5w3bc61UeaeKrrurFdRs+RwBVkXmtqm/i6g0ZTWZyWGO6gJd+HWA
+qY1NYiq4+cMvNLatmA2sOoCsRNmE9q6jM/ESVgaH8hSp8GcLuzt9/r4PZZGl5CvU
+eldOiD221u8rzuHmLs4dsgwJJ9pgLT0cUAsOpbMPI0JpGIPQ2SG6yK7LmO6HFOxb
+Akz7IGUt0gy1MzPTyBvnB+WgD1I+IQXXsJbhP5+d+d3mOnqsd6oDM/grKBzrhoUe
+oNadc9uzjqKlOrmrdIR3Bz38SSiWlde5fu6xPqJdmGZRNjXtcyJlbSPVDIloxw==
+=QWRO
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/archmap b/archmap
index 6ba1a9c..b602401 100644
--- a/archmap
+++ b/archmap
@@ -66,3 +66,5 @@ fedora-30-primary: i386 x86_64 armhfp aarch64 ppc64le s390x
 fedora-iot-2019: i386 x86_64 armhfp aarch64 ppc64le s390x
 
 fedora-31-primary: i386 x86_64 armhfp aarch64 ppc64le s390x
+
+fedora-32-primary: i386 x86_64 armhfp aarch64 ppc64le s390x
diff --git a/fedora-repos.spec b/fedora-repos.spec
index a82e2a2..0ba8236 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,7 +1,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
-Version:        31
-Release:        0.3%{?_module_build:%{?dist}}
+Version:        32
+Release:        0.1%{?_module_build:%{?dist}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -63,6 +63,7 @@ Source48:       RPM-GPG-KEY-fedora-28-primary
 Source49:       RPM-GPG-KEY-fedora-29-primary
 Source50:       RPM-GPG-KEY-fedora-30-primary
 Source51:       RPM-GPG-KEY-fedora-31-primary
+Source52:       RPM-GPG-KEY-fedora-32-primary
 
 Source100:      fedora-modular.repo
 Source101:      fedora-updates-modular.repo
@@ -166,6 +167,10 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/
 /etc/ostree/remotes.d/fedora.conf
 
 %changelog
+* Tue Aug 13 2019 Mohan Boddu <mboddu@bhujji.com> - 32-0.1
+- Adding F32 key
+- Setup for rawhide being f32
+
 * Tue Mar 12 2019 Vít Ondruch <vondruch@redhat.com> - 31-0.3
 - Allow to use newer GPG keys, so Rawhide can be updated after branch.
 

From a12c809ab2dcb730cbeb4a03c50d20e3d25cc048 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Mon, 19 Aug 2019 08:38:47 -0700
Subject: [PATCH 021/108] The f32 gpg public key has some extra spaces at the
 end of the first line, gpg errors on this, so fix it up.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 RPM-GPG-KEY-fedora-32-primary | 2 +-
 fedora-repos.spec             | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/RPM-GPG-KEY-fedora-32-primary b/RPM-GPG-KEY-fedora-32-primary
index cd0bd04..67bde34 100644
--- a/RPM-GPG-KEY-fedora-32-primary
+++ b/RPM-GPG-KEY-fedora-32-primary
@@ -1,4 +1,4 @@
------BEGIN PGP PUBLIC KEY BLOCK-----  
+-----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQINBF1RVqsBEADWMBqYv/G1r4PwyiPQCfg5fXFGXV1FCZ32qMi9gLUTv1CX7rYy
 H4Inj93oic+lt1kQ0kQCkINOwQczOkm6XDkEekmMrHknJpFLwrTK4AS28bYF2RjL
diff --git a/fedora-repos.spec b/fedora-repos.spec
index 0ba8236..b593934 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,7 +1,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        32
-Release:        0.1%{?_module_build:%{?dist}}
+Release:        0.2%{?_module_build:%{?dist}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -167,6 +167,9 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/
 /etc/ostree/remotes.d/fedora.conf
 
 %changelog
+* Mon Aug 19 2019 Kevin Fenzi <kevin@scrye.com> - 32-0.2
+- Fix f32 key having extra spaces.
+
 * Tue Aug 13 2019 Mohan Boddu <mboddu@bhujji.com> - 32-0.1
 - Adding F32 key
 - Setup for rawhide being f32

From 5a7ce7c539161258e4bad5ba723d17246b274197 Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@bhujji.com>
Date: Tue, 28 Jan 2020 05:11:39 -0500
Subject: [PATCH 022/108] Adding F33 key

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
---
 RPM-GPG-KEY-fedora-33-primary | 28 ++++++++++++++++++++++++++++
 fedora-repos.spec             |  6 +++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 RPM-GPG-KEY-fedora-33-primary

diff --git a/RPM-GPG-KEY-fedora-33-primary b/RPM-GPG-KEY-fedora-33-primary
new file mode 100644
index 0000000..ac8572f
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-33-primary
@@ -0,0 +1,28 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBF4wBvsBEADQmcGbVUbDRUoXADReRmOOEMeydHghtKC9uRs9YNpGYZIB+bie
+bGYZmflQayfh/wEpO2W/IZfGpHPL42V7SbyvqMjwNls/fnXsCtf4LRofNK8Qd9fN
+kYargc9R7BEz/mwXKMiRQVx+DzkmqGWy2gq4iD0/mCyf5FdJCE40fOWoIGJXaOI1
+Tz1vWqKwLS5T0dfmi9U4Tp/XsKOZGvN8oi5h0KmqFk7LEZr1MXarhi2Va86sgxsF
+QcZEKfu5tgD0r00vXzikoSjn3qA5JW5FW07F1pGP4bF5f9J3CZbQyOjTSWMmmfTm
+2d2BURWzaDiJN9twY2yjzkoOMuPdXXvovg7KxLcQerKT+FbKbq8DySJX2rnOA77k
+UG4c9BGf/L1uBkAT8dpHLk6Uf5BfmypxUkydSWT1xfTDnw1MqxO0MsLlAHOR3J7c
+oW9kLcOLuCQn1hBEwfZv7VSWBkGXSmKfp0LLIxAFgRtv+Dh+rcMMRdJgKr1V3FU+
+rZ1+ZAfYiBpQJFPjv70vx+rGEgS801D3PJxBZUEy4Ic4ZYaKNhK9x9PRQuWcIBuW
+6eTe/6lKWZeyxCumLLdiS75mF2oTcBaWeoc3QxrPRV15eDKeYJMbhnUai/7lSrhs
+EWCkKR1RivgF4slYmtNE5ZPGZ/d61zjwn2xi4xNJVs8q9WRPMpHp0vCyMwARAQAB
+tDFGZWRvcmEgKDMzKSA8ZmVkb3JhLTMzLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
+cmc+iQI4BBMBAgAiBQJeMAb7AhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK
+CRBJ/XdJlXD/MZm2D/9kriL43vd3+0DNMeA82n2v9mSR2PQqKny39xNlYPyy/1yZ
+P/KXoa4NYSCA971LSd7lv4n/h5bEKgGHxZfttfOzOnWMVSSTfjRyM/df/NNzTUEV
+7ORA5GW18g8PEtS7uRxVBf3cLvWu5q+8jmqES5HqTAdGVcuIFQeBXFN8Gy1Jinuz
+AH8rJSdkUeZ0cehWbERq80BWM9dhad5dW+/+Gv0foFBvP15viwhWqajr8V0B8es+
+2/tHI0k86FAujV5i0rrXl5UOoLilO57QQNDZH/qW9GsHwVI+2yecLstpUNLq+EZC
+GqTZCYoxYRpl0gAMbDLztSL/8Bc0tJrCRG3tavJotFYlgUK60XnXlQzRkh9rgsfT
+EXbQifWdQMMogzjCJr0hzJ+V1d0iozdUxB2ZEgTjukOvatkB77DY1FPZRkSFIQs+
+fdcjazDIBLIxwJu5QwvTNW8lOLnJ46g4sf1WJoUdNTbR0BaC7HHj1inVWi0p7IuN
+66EPGzJOSjLK+vW+J0ncPDEgLCV74RF/0nR5fVTdrmiopPrzFuguHf9S9gYI3Zun
+Yl8FJUu4kRO6JPPTicUXWX+8XZmE94aK14RCJL23nOSi8T1eW8JLW43dCBRO8QUE
+Aso1t2pypm/1zZexJdOV8yGME3g5l2W6PLgpz58DBECgqc/kda+VWgEAp7rO2A==
+=EPL3
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/fedora-repos.spec b/fedora-repos.spec
index b593934..d59f4e4 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,7 +1,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        32
-Release:        0.2%{?_module_build:%{?dist}}
+Release:        0.3%{?_module_build:%{?dist}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -64,6 +64,7 @@ Source49:       RPM-GPG-KEY-fedora-29-primary
 Source50:       RPM-GPG-KEY-fedora-30-primary
 Source51:       RPM-GPG-KEY-fedora-31-primary
 Source52:       RPM-GPG-KEY-fedora-32-primary
+Source53:       RPM-GPG-KEY-fedora-33-primary
 
 Source100:      fedora-modular.repo
 Source101:      fedora-updates-modular.repo
@@ -167,6 +168,9 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/
 /etc/ostree/remotes.d/fedora.conf
 
 %changelog
+* Tue Jan 28 2020 Mohan Boddu <mboddu@bhujji.com> - 32-0.3
+- Adding F33 key
+
 * Mon Aug 19 2019 Kevin Fenzi <kevin@scrye.com> - 32-0.2
 - Fix f32 key having extra spaces.
 

From f30862cebc7ece60f00f23bdd1803c9667152912 Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <patrick@puiterwijk.org>
Date: Mon, 10 Feb 2020 14:37:04 +0100
Subject: [PATCH 023/108] Remove baseurl download.fp.o

We want to discourage people from using download.fedoraproject.org, so
hopefully we get less people to use it for package downloads by not
"advertising" it as an option in the repo files.
It is vastly suboptimal to using metalink for all parties involved.

Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
---
 fedora-modular.repo                 | 3 ---
 fedora-rawhide-modular.repo         | 3 ---
 fedora-rawhide.repo                 | 3 ---
 fedora-updates-modular.repo         | 3 ---
 fedora-updates-testing-modular.repo | 3 ---
 fedora-updates-testing.repo         | 3 ---
 fedora-updates.repo                 | 3 ---
 fedora.repo                         | 3 ---
 8 files changed, 24 deletions(-)

diff --git a/fedora-modular.repo b/fedora-modular.repo
index 46f78e6..6523dc5 100644
--- a/fedora-modular.repo
+++ b/fedora-modular.repo
@@ -1,6 +1,5 @@
 [fedora-modular]
 name=Fedora Modular $releasever - $basearch
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/$basearch/os/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch
 enabled=0
 #metadata_expire=7d
@@ -12,7 +11,6 @@ skip_if_unavailable=False
 
 [fedora-modular-debuginfo]
 name=Fedora Modular $releasever - $basearch - Debug
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/$basearch/debug/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-debug-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
@@ -24,7 +22,6 @@ skip_if_unavailable=False
 
 [fedora-modular-source]
 name=Fedora Modular $releasever - Source
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/source/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-source-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
diff --git a/fedora-rawhide-modular.repo b/fedora-rawhide-modular.repo
index 9d0a63c..2ddd37d 100644
--- a/fedora-rawhide-modular.repo
+++ b/fedora-rawhide-modular.repo
@@ -21,7 +21,6 @@
 
 [rawhide-modular]
 name=Fedora - Modular Rawhide - Developmental packages for the next Fedora release
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Modular/$basearch/os/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular&arch=$basearch
 enabled=1
 metadata_expire=6h
@@ -33,7 +32,6 @@ skip_if_unavailable=False
 
 [rawhide-modular-debuginfo]
 name=Fedora - Modular Rawhide - Debug
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Modular/$basearch/debug/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular-debug&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -44,7 +42,6 @@ skip_if_unavailable=False
 
 [rawhide-modular-source]
 name=Fedora - Modular Rawhide - Source
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Modular/source/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular-source&arch=$basearch
 enabled=0
 repo_gpgcheck=0
diff --git a/fedora-rawhide.repo b/fedora-rawhide.repo
index 445b5da..96b4911 100644
--- a/fedora-rawhide.repo
+++ b/fedora-rawhide.repo
@@ -21,7 +21,6 @@
 
 [rawhide]
 name=Fedora - Rawhide - Developmental packages for the next Fedora release
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide//Everything/$basearch/os/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
 enabled=1
 metadata_expire=6h
@@ -33,7 +32,6 @@ skip_if_unavailable=False
 
 [rawhide-debuginfo]
 name=Fedora - Rawhide - Debug
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/$basearch/debug/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-debug&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -44,7 +42,6 @@ skip_if_unavailable=False
 
 [rawhide-source]
 name=Fedora - Rawhide - Source
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-source&arch=$basearch
 enabled=0
 repo_gpgcheck=0
diff --git a/fedora-updates-modular.repo b/fedora-updates-modular.repo
index c5b739f..5d3af68 100644
--- a/fedora-updates-modular.repo
+++ b/fedora-updates-modular.repo
@@ -1,7 +1,6 @@
 [updates-modular]
 name=Fedora Modular $releasever - $basearch - Updates
 failovermethod=priority
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/$basearch/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -14,7 +13,6 @@ skip_if_unavailable=False
 [updates-modular-debuginfo]
 name=Fedora Modular $releasever - $basearch - Updates - Debug
 failovermethod=priority
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/$basearch/debug/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-debug-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -27,7 +25,6 @@ skip_if_unavailable=False
 [updates-modular-source]
 name=Fedora Modular $releasever - Updates Source
 failovermethod=priority
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/SRPMS/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-source-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
diff --git a/fedora-updates-testing-modular.repo b/fedora-updates-testing-modular.repo
index 2be7ad0..2199e86 100644
--- a/fedora-updates-testing-modular.repo
+++ b/fedora-updates-testing-modular.repo
@@ -1,6 +1,5 @@
 [updates-testing-modular]
 name=Fedora Modular $releasever - $basearch - Test Updates
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/Modular/$basearch/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -12,7 +11,6 @@ skip_if_unavailable=False
 
 [updates-testing-modular-debuginfo]
 name=Fedora Modular $releasever - $basearch - Test Updates Debug
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/$basearch/debug/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-debug-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -24,7 +22,6 @@ skip_if_unavailable=False
 
 [updates-testing-modular-source]
 name=Fedora Modular $releasever - Test Updates Source
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/SRPMS/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-source-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
diff --git a/fedora-updates-testing.repo b/fedora-updates-testing.repo
index 21e0812..32c0794 100644
--- a/fedora-updates-testing.repo
+++ b/fedora-updates-testing.repo
@@ -1,6 +1,5 @@
 [updates-testing]
 name=Fedora $releasever - $basearch - Test Updates
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/Everything/$basearch/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -12,7 +11,6 @@ skip_if_unavailable=False
 
 [updates-testing-debuginfo]
 name=Fedora $releasever - $basearch - Test Updates Debug
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/Everything/$basearch/debug/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -24,7 +22,6 @@ skip_if_unavailable=False
 
 [updates-testing-source]
 name=Fedora $releasever - Test Updates Source
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/Everything/SRPMS/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-source-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
diff --git a/fedora-updates.repo b/fedora-updates.repo
index 4d5812a..db26f08 100644
--- a/fedora-updates.repo
+++ b/fedora-updates.repo
@@ -1,6 +1,5 @@
 [updates]
 name=Fedora $releasever - $basearch - Updates
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everything/$basearch/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -12,7 +11,6 @@ skip_if_unavailable=False
 
 [updates-debuginfo]
 name=Fedora $releasever - $basearch - Updates - Debug
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everything/$basearch/debug/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -24,7 +22,6 @@ skip_if_unavailable=False
 
 [updates-source]
 name=Fedora $releasever - Updates Source
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everything/SRPMS/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
diff --git a/fedora.repo b/fedora.repo
index faf643e..f3b69f5 100644
--- a/fedora.repo
+++ b/fedora.repo
@@ -1,6 +1,5 @@
 [fedora]
 name=Fedora $releasever - $basearch
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
 enabled=0
 #metadata_expire=7d
@@ -12,7 +11,6 @@ skip_if_unavailable=False
 
 [fedora-debuginfo]
 name=Fedora $releasever - $basearch - Debug
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
@@ -24,7 +22,6 @@ skip_if_unavailable=False
 
 [fedora-source]
 name=Fedora $releasever - Source
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/source/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d

From 050cf0087f6c3d3103bfb8bd9cc06500a93eaa91 Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@bhujji.com>
Date: Tue, 1 Oct 2019 12:52:42 -0400
Subject: [PATCH 024/108] Enabling dnf countme

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1737516

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
---
 fedora-modular.repo                 | 1 +
 fedora-rawhide-modular.repo         | 1 +
 fedora-rawhide.repo                 | 1 +
 fedora-updates-modular.repo         | 1 +
 fedora-updates-testing-modular.repo | 1 +
 fedora-updates-testing.repo         | 1 +
 fedora-updates.repo                 | 1 +
 fedora.repo                         | 1 +
 8 files changed, 8 insertions(+)

diff --git a/fedora-modular.repo b/fedora-modular.repo
index 6523dc5..e7c436e 100644
--- a/fedora-modular.repo
+++ b/fedora-modular.repo
@@ -2,6 +2,7 @@
 name=Fedora Modular $releasever - $basearch
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch
 enabled=0
+countme=1
 #metadata_expire=7d
 repo_gpgcheck=0
 type=rpm
diff --git a/fedora-rawhide-modular.repo b/fedora-rawhide-modular.repo
index 2ddd37d..25548ac 100644
--- a/fedora-rawhide-modular.repo
+++ b/fedora-rawhide-modular.repo
@@ -23,6 +23,7 @@
 name=Fedora - Modular Rawhide - Developmental packages for the next Fedora release
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular&arch=$basearch
 enabled=1
+countme=1
 metadata_expire=6h
 repo_gpgcheck=0
 type=rpm
diff --git a/fedora-rawhide.repo b/fedora-rawhide.repo
index 96b4911..7fb162c 100644
--- a/fedora-rawhide.repo
+++ b/fedora-rawhide.repo
@@ -23,6 +23,7 @@
 name=Fedora - Rawhide - Developmental packages for the next Fedora release
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
 enabled=1
+countme=1
 metadata_expire=6h
 repo_gpgcheck=0
 type=rpm
diff --git a/fedora-updates-modular.repo b/fedora-updates-modular.repo
index 5d3af68..d8526fc 100644
--- a/fedora-updates-modular.repo
+++ b/fedora-updates-modular.repo
@@ -3,6 +3,7 @@ name=Fedora Modular $releasever - $basearch - Updates
 failovermethod=priority
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-f$releasever&arch=$basearch
 enabled=0
+countme=1
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
diff --git a/fedora-updates-testing-modular.repo b/fedora-updates-testing-modular.repo
index 2199e86..9dcedbb 100644
--- a/fedora-updates-testing-modular.repo
+++ b/fedora-updates-testing-modular.repo
@@ -2,6 +2,7 @@
 name=Fedora Modular $releasever - $basearch - Test Updates
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-f$releasever&arch=$basearch
 enabled=0
+countme=1
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
diff --git a/fedora-updates-testing.repo b/fedora-updates-testing.repo
index 32c0794..db00456 100644
--- a/fedora-updates-testing.repo
+++ b/fedora-updates-testing.repo
@@ -2,6 +2,7 @@
 name=Fedora $releasever - $basearch - Test Updates
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
 enabled=0
+countme=1
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
diff --git a/fedora-updates.repo b/fedora-updates.repo
index db26f08..3691dc4 100644
--- a/fedora-updates.repo
+++ b/fedora-updates.repo
@@ -2,6 +2,7 @@
 name=Fedora $releasever - $basearch - Updates
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
 enabled=0
+countme=1
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
diff --git a/fedora.repo b/fedora.repo
index f3b69f5..3e59790 100644
--- a/fedora.repo
+++ b/fedora.repo
@@ -2,6 +2,7 @@
 name=Fedora $releasever - $basearch
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
 enabled=0
+countme=1
 #metadata_expire=7d
 repo_gpgcheck=0
 type=rpm

From 55b4e6766ef1baa7e8182c9f52926313794d9b7d Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@bhujji.com>
Date: Tue, 11 Feb 2020 08:50:17 -0500
Subject: [PATCH 025/108] Remove baseurl download.fp.o (puiterwijk) Enabling
 dnf countme

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
---
 fedora-repos.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index d59f4e4..bf3f993 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,7 +1,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        32
-Release:        0.3%{?_module_build:%{?dist}}
+Release:        0.4%{?_module_build:%{?dist}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -168,6 +168,10 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/
 /etc/ostree/remotes.d/fedora.conf
 
 %changelog
+* Tue Feb 11 2020 Mohan Boddu <mboddu@bhujji.com> - 32-0.4
+- Remove baseurl download.fp.o (puiterwijk)
+- Enabling dnf countme
+
 * Tue Jan 28 2020 Mohan Boddu <mboddu@bhujji.com> - 32-0.3
 - Adding F33 key
 

From e08b57becb705275c221c096cabb6e6ddff7c1c6 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Tue, 11 Feb 2020 07:06:31 -0800
Subject: [PATCH 026/108] remove failovermethod from modular repos too

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 fedora-updates-modular.repo | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/fedora-updates-modular.repo b/fedora-updates-modular.repo
index d8526fc..b73258f 100644
--- a/fedora-updates-modular.repo
+++ b/fedora-updates-modular.repo
@@ -1,6 +1,5 @@
 [updates-modular]
 name=Fedora Modular $releasever - $basearch - Updates
-failovermethod=priority
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-f$releasever&arch=$basearch
 enabled=0
 countme=1
@@ -13,7 +12,6 @@ skip_if_unavailable=False
 
 [updates-modular-debuginfo]
 name=Fedora Modular $releasever - $basearch - Updates - Debug
-failovermethod=priority
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-debug-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -25,7 +23,6 @@ skip_if_unavailable=False
 
 [updates-modular-source]
 name=Fedora Modular $releasever - Updates Source
-failovermethod=priority
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-source-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0

From 0ffaa0b688d278e418b55d2f9a9075be8e0bc759 Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@bhujji.com>
Date: Tue, 11 Feb 2020 10:13:52 -0500
Subject: [PATCH 027/108] Setup for rawhide being F33

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
---
 archmap           | 2 ++
 fedora-repos.spec | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/archmap b/archmap
index b602401..cfd6fb7 100644
--- a/archmap
+++ b/archmap
@@ -68,3 +68,5 @@ fedora-iot-2019: i386 x86_64 armhfp aarch64 ppc64le s390x
 fedora-31-primary: i386 x86_64 armhfp aarch64 ppc64le s390x
 
 fedora-32-primary: i386 x86_64 armhfp aarch64 ppc64le s390x
+
+fedora-33-primary: i386 x86_64 armhfp aarch64 ppc64le s390x
diff --git a/fedora-repos.spec b/fedora-repos.spec
index bf3f993..0763f8e 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,7 +1,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
-Version:        32
-Release:        0.4%{?_module_build:%{?dist}}
+Version:        33
+Release:        0.1%{?_module_build:%{?dist}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -168,6 +168,9 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/
 /etc/ostree/remotes.d/fedora.conf
 
 %changelog
+* Tue Feb 11 2020 Mohan Boddu <mboddu@bhujji.com> - 33-0.1
+- Setup for rawhide being F33
+
 * Tue Feb 11 2020 Mohan Boddu <mboddu@bhujji.com> - 32-0.4
 - Remove baseurl download.fp.o (puiterwijk)
 - Enabling dnf countme

From 29336dbfef8aafecd34559ef9dd61f8ad30cbe16 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Tue, 18 Feb 2020 09:47:29 -0800
Subject: [PATCH 028/108] Re-add baseurl lines, but using example domain

This sorta reverts f30862ce, because it turns out various people
(including me!) actually rely on these commented-out baseurl
lines in various ways. I (in openQA tests) and at least one other
person (hiredman on IRC), for e.g., use them as a base to modify
by changing the host, but keeping the path component, to use a
specific host that is known to always be a fast local one in a
particular environment and avoid the overhead of the metalink/
mirrorlist system.

To avoid encouraging the use of the download.fedoraproject.org
redirect system (as was the original intent), we replace the
hostname with an example one, so the line clearly cannot be used
as-is just by removing the #. We *could* also add a couple of
comment lines specifically discouraging people from using baseurl
unless they're very sure it's what they need, but I don't know
if it's necessary.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 fedora-modular.repo                 | 3 +++
 fedora-rawhide-modular.repo         | 3 +++
 fedora-rawhide.repo                 | 3 +++
 fedora-updates-modular.repo         | 3 +++
 fedora-updates-testing-modular.repo | 3 +++
 fedora-updates-testing.repo         | 3 +++
 fedora-updates.repo                 | 3 +++
 fedora.repo                         | 3 +++
 8 files changed, 24 insertions(+)

diff --git a/fedora-modular.repo b/fedora-modular.repo
index e7c436e..5aa9c26 100644
--- a/fedora-modular.repo
+++ b/fedora-modular.repo
@@ -1,5 +1,6 @@
 [fedora-modular]
 name=Fedora Modular $releasever - $basearch
+#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Modular/$basearch/os/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch
 enabled=0
 countme=1
@@ -12,6 +13,7 @@ skip_if_unavailable=False
 
 [fedora-modular-debuginfo]
 name=Fedora Modular $releasever - $basearch - Debug
+#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Modular/$basearch/debug/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-debug-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
@@ -23,6 +25,7 @@ skip_if_unavailable=False
 
 [fedora-modular-source]
 name=Fedora Modular $releasever - Source
+#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Modular/source/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-source-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
diff --git a/fedora-rawhide-modular.repo b/fedora-rawhide-modular.repo
index 25548ac..5646313 100644
--- a/fedora-rawhide-modular.repo
+++ b/fedora-rawhide-modular.repo
@@ -21,6 +21,7 @@
 
 [rawhide-modular]
 name=Fedora - Modular Rawhide - Developmental packages for the next Fedora release
+#baseurl=http://download.example/pub/fedora/linux/development/rawhide/Modular/$basearch/os/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular&arch=$basearch
 enabled=1
 countme=1
@@ -33,6 +34,7 @@ skip_if_unavailable=False
 
 [rawhide-modular-debuginfo]
 name=Fedora - Modular Rawhide - Debug
+#baseurl=http://download.example/pub/fedora/linux/development/rawhide/Modular/$basearch/debug/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular-debug&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -43,6 +45,7 @@ skip_if_unavailable=False
 
 [rawhide-modular-source]
 name=Fedora - Modular Rawhide - Source
+#baseurl=http://download.example/pub/fedora/linux/development/rawhide/Modular/source/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular-source&arch=$basearch
 enabled=0
 repo_gpgcheck=0
diff --git a/fedora-rawhide.repo b/fedora-rawhide.repo
index 7fb162c..2e649e6 100644
--- a/fedora-rawhide.repo
+++ b/fedora-rawhide.repo
@@ -21,6 +21,7 @@
 
 [rawhide]
 name=Fedora - Rawhide - Developmental packages for the next Fedora release
+#baseurl=http://download.example/pub/fedora/linux/development/rawhide//Everything/$basearch/os/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
 enabled=1
 countme=1
@@ -33,6 +34,7 @@ skip_if_unavailable=False
 
 [rawhide-debuginfo]
 name=Fedora - Rawhide - Debug
+#baseurl=http://download.example/pub/fedora/linux/development/rawhide/Everything/$basearch/debug/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-debug&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -43,6 +45,7 @@ skip_if_unavailable=False
 
 [rawhide-source]
 name=Fedora - Rawhide - Source
+#baseurl=http://download.example/pub/fedora/linux/development/rawhide/Everything/source/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-source&arch=$basearch
 enabled=0
 repo_gpgcheck=0
diff --git a/fedora-updates-modular.repo b/fedora-updates-modular.repo
index b73258f..37e4b71 100644
--- a/fedora-updates-modular.repo
+++ b/fedora-updates-modular.repo
@@ -1,5 +1,6 @@
 [updates-modular]
 name=Fedora Modular $releasever - $basearch - Updates
+#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/$basearch/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-f$releasever&arch=$basearch
 enabled=0
 countme=1
@@ -12,6 +13,7 @@ skip_if_unavailable=False
 
 [updates-modular-debuginfo]
 name=Fedora Modular $releasever - $basearch - Updates - Debug
+#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/$basearch/debug/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-debug-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -23,6 +25,7 @@ skip_if_unavailable=False
 
 [updates-modular-source]
 name=Fedora Modular $releasever - Updates Source
+#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/SRPMS/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-source-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
diff --git a/fedora-updates-testing-modular.repo b/fedora-updates-testing-modular.repo
index 9dcedbb..5cd78af 100644
--- a/fedora-updates-testing-modular.repo
+++ b/fedora-updates-testing-modular.repo
@@ -1,5 +1,6 @@
 [updates-testing-modular]
 name=Fedora Modular $releasever - $basearch - Test Updates
+#baseurl=http://download.example/pub/fedora/linux/updates/testing/$releasever/Modular/$basearch/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-f$releasever&arch=$basearch
 enabled=0
 countme=1
@@ -12,6 +13,7 @@ skip_if_unavailable=False
 
 [updates-testing-modular-debuginfo]
 name=Fedora Modular $releasever - $basearch - Test Updates Debug
+#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/$basearch/debug/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-debug-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -23,6 +25,7 @@ skip_if_unavailable=False
 
 [updates-testing-modular-source]
 name=Fedora Modular $releasever - Test Updates Source
+#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/SRPMS/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-source-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
diff --git a/fedora-updates-testing.repo b/fedora-updates-testing.repo
index db00456..9306abb 100644
--- a/fedora-updates-testing.repo
+++ b/fedora-updates-testing.repo
@@ -1,5 +1,6 @@
 [updates-testing]
 name=Fedora $releasever - $basearch - Test Updates
+#baseurl=http://download.example/pub/fedora/linux/updates/testing/$releasever/Everything/$basearch/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
 enabled=0
 countme=1
@@ -12,6 +13,7 @@ skip_if_unavailable=False
 
 [updates-testing-debuginfo]
 name=Fedora $releasever - $basearch - Test Updates Debug
+#baseurl=http://download.example/pub/fedora/linux/updates/testing/$releasever/Everything/$basearch/debug/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -23,6 +25,7 @@ skip_if_unavailable=False
 
 [updates-testing-source]
 name=Fedora $releasever - Test Updates Source
+#baseurl=http://download.example/pub/fedora/linux/updates/testing/$releasever/Everything/SRPMS/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-source-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
diff --git a/fedora-updates.repo b/fedora-updates.repo
index 3691dc4..9992c83 100644
--- a/fedora-updates.repo
+++ b/fedora-updates.repo
@@ -1,5 +1,6 @@
 [updates]
 name=Fedora $releasever - $basearch - Updates
+#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/$basearch/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
 enabled=0
 countme=1
@@ -12,6 +13,7 @@ skip_if_unavailable=False
 
 [updates-debuginfo]
 name=Fedora $releasever - $basearch - Updates - Debug
+#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/$basearch/debug/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -23,6 +25,7 @@ skip_if_unavailable=False
 
 [updates-source]
 name=Fedora $releasever - Updates Source
+#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/SRPMS/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
diff --git a/fedora.repo b/fedora.repo
index 3e59790..b39369e 100644
--- a/fedora.repo
+++ b/fedora.repo
@@ -1,5 +1,6 @@
 [fedora]
 name=Fedora $releasever - $basearch
+#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
 enabled=0
 countme=1
@@ -12,6 +13,7 @@ skip_if_unavailable=False
 
 [fedora-debuginfo]
 name=Fedora $releasever - $basearch - Debug
+#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
@@ -23,6 +25,7 @@ skip_if_unavailable=False
 
 [fedora-source]
 name=Fedora $releasever - Source
+#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/source/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d

From ea28479df1265320a3f721ea8c6fc14350a86d56 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Wed, 19 Feb 2020 10:02:52 -0800
Subject: [PATCH 029/108] Bump for build

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 fedora-repos.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index 0763f8e..a11dae2 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,7 +1,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        33
-Release:        0.1%{?_module_build:%{?dist}}
+Release:        0.2%{?_module_build:%{?dist}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -168,6 +168,9 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/
 /etc/ostree/remotes.d/fedora.conf
 
 %changelog
+* Wed Feb 19 2020 Adam Williamson <awilliam@redhat.com> - 33-0.2
+- Restore baseurl lines, but with example domain
+
 * Tue Feb 11 2020 Mohan Boddu <mboddu@bhujji.com> - 33-0.1
 - Setup for rawhide being F33
 

From 7f050d24a624be37efd8e21f12087d27a77695bc Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa13@gmail.com>
Date: Sat, 22 Feb 2020 18:49:06 -0500
Subject: [PATCH 030/108] Enable fedora-cisco-openh264 repo by default

Signed-off-by: Neal Gompa <ngompa13@gmail.com>
---
 fedora-cisco-openh264.repo | 2 +-
 fedora-repos.spec          | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/fedora-cisco-openh264.repo b/fedora-cisco-openh264.repo
index 32a3241..dbd59a3 100644
--- a/fedora-cisco-openh264.repo
+++ b/fedora-cisco-openh264.repo
@@ -2,7 +2,7 @@
 name=Fedora $releasever openh264 (From Cisco) - $basearch
 baseurl=https://codecs.fedoraproject.org/openh264/$releasever/$basearch/
 type=rpm
-enabled=0
+enabled=1
 enabled_metadata=1
 metadata_expire=14d
 repo_gpgcheck=1
diff --git a/fedora-repos.spec b/fedora-repos.spec
index a11dae2..f5bf312 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,7 +1,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        33
-Release:        0.2%{?_module_build:%{?dist}}
+Release:        0.3%{?_module_build:%{?dist}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -168,6 +168,9 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/
 /etc/ostree/remotes.d/fedora.conf
 
 %changelog
+* Sat Feb 22 2020 Neal Gompa <ngompa13@gmail.com> - 33-0.3
+- Enable fedora-cisco-openh264 repo by default
+
 * Wed Feb 19 2020 Adam Williamson <awilliam@redhat.com> - 33-0.2
 - Restore baseurl lines, but with example domain
 

From 8a5064f34c9d1d95524a37fe5b9e04affab5c901 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Thu, 9 Apr 2020 14:08:03 +0200
Subject: [PATCH 031/108] Switch to metalink for fedora-cisco-openh264 and
 disable repo gpgcheck

dnf has various bugs around repo_gpgcheck=1 repos and this allows us to
work this around.

https://bugzilla.redhat.com/show_bug.cgi?id=1768206

Signed-off-by: Kalev Lember <klember@redhat.com>
---
 fedora-cisco-openh264.repo | 8 ++++----
 fedora-repos.spec          | 6 +++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/fedora-cisco-openh264.repo b/fedora-cisco-openh264.repo
index dbd59a3..43234c3 100644
--- a/fedora-cisco-openh264.repo
+++ b/fedora-cisco-openh264.repo
@@ -1,22 +1,22 @@
 [fedora-cisco-openh264]
 name=Fedora $releasever openh264 (From Cisco) - $basearch
-baseurl=https://codecs.fedoraproject.org/openh264/$releasever/$basearch/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-cisco-openh264-$releasever&arch=$basearch
 type=rpm
 enabled=1
 enabled_metadata=1
 metadata_expire=14d
-repo_gpgcheck=1
+repo_gpgcheck=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 skip_if_unavailable=True
 
 [fedora-cisco-openh264-debuginfo]
 name=Fedora $releasever openh264 (From Cisco) - $basearch - Debug
-baseurl=https://codecs.fedoraproject.org/openh264/$releasever/$basearch/debug/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-cisco-openh264-debug-$releasever&arch=$basearch
 type=rpm
 enabled=0
 metadata_expire=28d
-repo_gpgcheck=1
+repo_gpgcheck=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 skip_if_unavailable=True
diff --git a/fedora-repos.spec b/fedora-repos.spec
index f5bf312..31f452b 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,7 +1,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        33
-Release:        0.3%{?_module_build:%{?dist}}
+Release:        0.4%{?_module_build:%{?dist}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -168,6 +168,10 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/
 /etc/ostree/remotes.d/fedora.conf
 
 %changelog
+* Thu Apr 09 2020 Kalev Lember <klember@redhat.com> - 33-0.4
+- Switch to metalink for fedora-cisco-openh264 and disable repo gpgcheck
+  (#1768206)
+
 * Sat Feb 22 2020 Neal Gompa <ngompa13@gmail.com> - 33-0.3
 - Enable fedora-cisco-openh264 repo by default
 

From 04a5476525c5bd84b15dfb3c2aca18f83b6b7514 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Thu, 9 Apr 2020 14:09:32 +0200
Subject: [PATCH 032/108] Use the same metadata_expire time for
 fedora-cisco-openh264 and -debuginfo

The repos are updated together so we should make sure they expire at the
same time as well.

Signed-off-by: Kalev Lember <klember@redhat.com>
---
 fedora-cisco-openh264.repo | 2 +-
 fedora-repos.spec          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/fedora-cisco-openh264.repo b/fedora-cisco-openh264.repo
index 43234c3..4728915 100644
--- a/fedora-cisco-openh264.repo
+++ b/fedora-cisco-openh264.repo
@@ -15,7 +15,7 @@ name=Fedora $releasever openh264 (From Cisco) - $basearch - Debug
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-cisco-openh264-debug-$releasever&arch=$basearch
 type=rpm
 enabled=0
-metadata_expire=28d
+metadata_expire=14d
 repo_gpgcheck=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
diff --git a/fedora-repos.spec b/fedora-repos.spec
index 31f452b..c95cbcc 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -171,6 +171,7 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/
 * Thu Apr 09 2020 Kalev Lember <klember@redhat.com> - 33-0.4
 - Switch to metalink for fedora-cisco-openh264 and disable repo gpgcheck
   (#1768206)
+- Use the same metadata_expire time for fedora-cisco-openh264 and -debuginfo
 
 * Sat Feb 22 2020 Neal Gompa <ngompa13@gmail.com> - 33-0.3
 - Enable fedora-cisco-openh264 repo by default

From fe18a9e2911ede282ffcd4e358dc46ec74348613 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Thu, 9 Apr 2020 14:10:55 +0200
Subject: [PATCH 033/108] Remove enabled_metadata key for fedora-cisco-openh264

The repo is enabled by default now so we no longer need this.

Signed-off-by: Kalev Lember <klember@redhat.com>
---
 fedora-cisco-openh264.repo | 1 -
 fedora-repos.spec          | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/fedora-cisco-openh264.repo b/fedora-cisco-openh264.repo
index 4728915..02150d9 100644
--- a/fedora-cisco-openh264.repo
+++ b/fedora-cisco-openh264.repo
@@ -3,7 +3,6 @@ name=Fedora $releasever openh264 (From Cisco) - $basearch
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-cisco-openh264-$releasever&arch=$basearch
 type=rpm
 enabled=1
-enabled_metadata=1
 metadata_expire=14d
 repo_gpgcheck=0
 gpgcheck=1
diff --git a/fedora-repos.spec b/fedora-repos.spec
index c95cbcc..6b0fe3c 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -172,6 +172,7 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/
 - Switch to metalink for fedora-cisco-openh264 and disable repo gpgcheck
   (#1768206)
 - Use the same metadata_expire time for fedora-cisco-openh264 and -debuginfo
+- Remove enabled_metadata key for fedora-cisco-openh264
 
 * Sat Feb 22 2020 Neal Gompa <ngompa13@gmail.com> - 33-0.3
 - Enable fedora-cisco-openh264 repo by default

From 361022265dc66435810ca0f994d108e97b14ec35 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Mon, 13 Apr 2020 10:10:51 -0400
Subject: [PATCH 034/108] Add the release to the fedora-repos(NN) Provides:

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
---
 fedora-repos.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index 6b0fe3c..c4b32e9 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,11 +1,11 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        33
-Release:        0.4%{?_module_build:%{?dist}}
+Release:        0.5%{?_module_build:%{?dist}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
-Provides:       fedora-repos(%{version})
+Provides:       fedora-repos(%{version}) = %{release}
 Requires:       system-release(%{version})
 Requires:       fedora-repos-rawhide = %{version}-%{release}
 Requires:       fedora-gpg-keys >= %{version}-%{release}
@@ -168,6 +168,9 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/
 /etc/ostree/remotes.d/fedora.conf
 
 %changelog
+* Mon Apr 13 2020 Stephen Gallagher <sgallagh@redhat.com> - 33-0.5
+- Add the release to the fedora-repos(NN) Provides:
+
 * Thu Apr 09 2020 Kalev Lember <klember@redhat.com> - 33-0.4
 - Switch to metalink for fedora-cisco-openh264 and disable repo gpgcheck
   (#1768206)

From c99e0fd39ba0cfce89ce76e28f41cab36132f52c Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Mon, 1 Jun 2020 23:49:49 -0400
Subject: [PATCH 035/108] Add fedora compose ostree repo to fedora-repos-ostree
 subpackage

This will allow community members to more easily test development
builds because the remote information for the compose ostree repo
will already be on the system. That means they'll be a simple
`rpm-ostree rebase fedora-compose:<ref>` away from testing out a
development version.

Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
---
 fedora-compose.conf | 4 ++++
 fedora-repos.spec   | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 fedora-compose.conf

diff --git a/fedora-compose.conf b/fedora-compose.conf
new file mode 100644
index 0000000..8bf015d
--- /dev/null
+++ b/fedora-compose.conf
@@ -0,0 +1,4 @@
+[remote "fedora-compose"]
+url=https://kojipkgs.fedoraproject.org/compose/ostree/repo/
+gpg-verify=true
+gpgkeypath=/etc/pki/rpm-gpg/
diff --git a/fedora-repos.spec b/fedora-repos.spec
index c4b32e9..f729bcf 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,7 +1,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        33
-Release:        0.5%{?_module_build:%{?dist}}
+Release:        0.6%{?_module_build:%{?dist}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -74,6 +74,7 @@ Source104:      RPM-GPG-KEY-fedora-modularity
 
 Source150:      RPM-GPG-KEY-fedora-iot-2019
 Source151:      fedora.conf
+Source152:      fedora-compose.conf
 
 %description
 Fedora package repository files for yum and dnf along with gpg public keys
@@ -141,6 +142,7 @@ done
 # Install ostree remote config
 install -d -m 755 $RPM_BUILD_ROOT/etc/ostree/remotes.d/
 install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/
+install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/
 
 %files
 %dir /etc/yum.repos.d
@@ -166,8 +168,12 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/
 %files ostree
 %dir /etc/ostree/remotes.d/
 /etc/ostree/remotes.d/fedora.conf
+/etc/ostree/remotes.d/fedora-compose.conf
 
 %changelog
+* Mon Jun 01 2020 Dusty Mabe <dusty@dustymabe.com> - 33-0.6
+- Add fedora compose ostree repo to fedora-repos-ostree
+
 * Mon Apr 13 2020 Stephen Gallagher <sgallagh@redhat.com> - 33-0.5
 - Add the release to the fedora-repos(NN) Provides:
 

From 007b8f2bd6ce1a094e9daf6d29c3424749bd6e3d Mon Sep 17 00:00:00 2001
From: Igor Raits <ignatenkobrain@fedoraproject.org>
Date: Mon, 25 May 2020 11:10:00 +0200
Subject: [PATCH 036/108] Split modular repos to the separate packages

Since modular repos do not contain any defaults (and most likely will
not in the near future) and slow-down (even though just a bit) DNF,
there is no point in shipping them on by default. However, anybody who
is interested in them, cam install fedora-repos-modular and get all the
content from there. Those repos are still enabled by default as long as
you have a package installed.

References: https://pagure.io/fesco/issue/2114
Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
---
 fedora-repos.spec | 37 ++++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index f729bcf..25b4b73 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,17 +1,15 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        33
-Release:        0.6%{?_module_build:%{?dist}}
+Release:        0.7%{?_module_build:%{?dist}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
 Provides:       fedora-repos(%{version}) = %{release}
 Requires:       system-release(%{version})
+Obsoletes:      fedora-repos < 33-0.7
 Requires:       fedora-repos-rawhide = %{version}-%{release}
 Requires:       fedora-gpg-keys >= %{version}-%{release}
-Obsoletes:      fedora-repos-anaconda < 22-0.3
-Obsoletes:      fedora-repos-modular < 29-0.6
-Provides:       fedora-repos-modular = %{version}-%{release}
 BuildArch:      noarch
 
 Source1:        archmap
@@ -77,22 +75,36 @@ Source151:      fedora.conf
 Source152:      fedora-compose.conf
 
 %description
-Fedora package repository files for yum and dnf along with gpg public keys
+Fedora package repository files for yum and dnf along with gpg public keys.
+
+%package modular
+Summary:        Fedora modular package repositories
+Requires:       fedora-repos = %{version}-%{release}
+Requires:       fedora-repos-rawhide-modular = %{version}-%{release}
+Obsoletes:      fedora-repos < 33-0.7
+
+%description modular
+This package provides the repo definitions with modular packages.
 
 %package rawhide
 Summary:        Rawhide repo definitions
 Requires:       fedora-repos = %{version}-%{release}
-Obsoletes:      fedora-release-rawhide <= 22-0.3
-Obsoletes:      fedora-repos-rawhide-modular < 29-0.6
-Provides:       fedora-repos-rawhide-modular = %{version}-%{release}
+Obsoletes:      fedora-repos-rawhide < 33-0.7
 
 %description rawhide
 This package provides the rawhide repo definitions.
 
+%package rawhide-modular
+Summary:        Rawhide modular repo definitions
+Requires:       fedora-repos = %{version}-%{release}
+Requires:       fedora-repos-rawhide = %{version}-%{release}
+Obsoletes:      fedora-repos-rawhide < 33-0.7
+
+%description rawhide-modular
+This package provides the rawhide modular repo definitions.
 
 %package -n fedora-gpg-keys
 Summary:        Fedora RPM keys
-Obsoletes:      fedora-release-rawhide <= 22-0.3
 
 %description -n fedora-gpg-keys
 This package provides the RPM signature keys.
@@ -151,12 +163,16 @@ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remo
 %config(noreplace) /etc/yum.repos.d/fedora-cisco-openh264.repo
 %config(noreplace) /etc/yum.repos.d/fedora-updates.repo
 %config(noreplace) /etc/yum.repos.d/fedora-updates-testing.repo
+
+%files modular
 %config(noreplace) /etc/yum.repos.d/fedora-modular.repo
 %config(noreplace) /etc/yum.repos.d/fedora-updates-modular.repo
 %config(noreplace) /etc/yum.repos.d/fedora-updates-testing-modular.repo
 
 %files rawhide
 %config(noreplace) /etc/yum.repos.d/fedora-rawhide.repo
+
+%files rawhide-modular
 %config(noreplace) /etc/yum.repos.d/fedora-rawhide-modular.repo
 
 
@@ -171,6 +187,9 @@ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remo
 /etc/ostree/remotes.d/fedora-compose.conf
 
 %changelog
+* Mon Jun 29 21:10:15 CEST 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 33-0.7
+- Split modular repos to the separate packages
+
 * Mon Jun 01 2020 Dusty Mabe <dusty@dustymabe.com> - 33-0.6
 - Add fedora compose ostree repo to fedora-repos-ostree
 

From 24799c1818238fa457f197b504c651636e8eac6b Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Fri, 26 Jun 2020 13:25:04 -0400
Subject: [PATCH 037/108] Add optional ELN repositories' subpackage

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
---
 fedora-eln-modular.repo | 56 +++++++++++++++++++++++++++++++++++++++++
 fedora-eln.repo         | 56 +++++++++++++++++++++++++++++++++++++++++
 fedora-repos.spec       | 23 ++++++++++++++++-
 3 files changed, 134 insertions(+), 1 deletion(-)
 create mode 100644 fedora-eln-modular.repo
 create mode 100644 fedora-eln.repo

diff --git a/fedora-eln-modular.repo b/fedora-eln-modular.repo
new file mode 100644
index 0000000..5c1165a
--- /dev/null
+++ b/fedora-eln-modular.repo
@@ -0,0 +1,56 @@
+# These packages are untested and still under development. This
+# repository is used for development of new releases.
+#
+# This repository can see significant daily turnover and major
+# functionality changes which cause unexpected problems with other
+# development packages. Please use these packages if you want to work
+# with the Fedora developers by testing these new development packages.
+#
+# # https://admin.fedoraproject.org/mailman/listinfo/test (Subscription
+# Required) is available as a discussion forum for
+# testing and troubleshooting for development packages in conjunction
+# with new test releases.
+#
+# More information is available at http://fedoraproject.org/wiki/Testing 
+#
+# Reproducible and reportable issues should be filed at
+# http://bugzilla.redhat.com/.
+#
+# Product: Fedora
+# Version: eln-modular
+
+[eln-modular]
+name=Fedora - Modular ELN - Developmental modular packages for the next Enterprise Linux release
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Modular/$basearch/os/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-modular&arch=$basearch
+enabled=1
+countme=1
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
+[eln-modular-debuginfo]
+name=Fedora - Modular ELN - Debug
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Modular/x86_64/debug/tree
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-modular-debug&arch=$basearch
+enabled=0
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
+[eln-modular-source]
+name=Fedora - Modular ELN - Source
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Modular/source/tree/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-modular-source&arch=$basearch
+enabled=0
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
diff --git a/fedora-eln.repo b/fedora-eln.repo
new file mode 100644
index 0000000..1b02c9b
--- /dev/null
+++ b/fedora-eln.repo
@@ -0,0 +1,56 @@
+# These packages are untested and still under development. This
+# repository is used for development of new releases.
+#
+# This repository can see significant daily turnover and major
+# functionality changes which cause unexpected problems with other
+# development packages. Please use these packages if you want to work
+# with the Fedora developers by testing these new development packages.
+#
+# # https://admin.fedoraproject.org/mailman/listinfo/test (Subscription
+# Required) is available as a discussion forum for
+# testing and troubleshooting for development packages in conjunction
+# with new test releases.
+#
+# More information is available at http://fedoraproject.org/wiki/Testing 
+#
+# Reproducible and reportable issues should be filed at
+# http://bugzilla.redhat.com/.
+#
+# Product: Fedora
+# Version: eln
+
+[eln]
+name=Fedora - ELN - Developmental modular packages for the next Enterprise Linux release
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Everything/$basearch/os/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
+enabled=1
+countme=1
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
+[eln-debuginfo]
+name=Fedora - ELN - Debug
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Everything/x86_64/debug/tree
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
+enabled=0
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
+[eln-source]
+name=Fedora - ELN - Source
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Everything/source/tree/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
+enabled=0
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
diff --git a/fedora-repos.spec b/fedora-repos.spec
index 25b4b73..4f8f577 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,7 +1,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        33
-Release:        0.7%{?_module_build:%{?dist}}
+Release:        0.8%{?_module_build:%{?dist}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -74,6 +74,9 @@ Source150:      RPM-GPG-KEY-fedora-iot-2019
 Source151:      fedora.conf
 Source152:      fedora-compose.conf
 
+Source200:      fedora-eln.repo
+Source201:      fedora-eln-modular.repo
+
 %description
 Fedora package repository files for yum and dnf along with gpg public keys.
 
@@ -118,6 +121,16 @@ This package provides ostree specfic files like remote config from
 where client's system will pull OSTree updates.
 
 
+%package eln
+Summary: ELN repo definitions
+Requires: fedora-repos-rawhide = %{version}-%{release}
+Requires: fedora-repos-rawhide-modular = %{version}-%{release}
+
+%description eln
+This package provides repository files for ELN (Enterprise Linux Next)
+packages that can be installed atop Rawhide. Note that these packages are
+experimental and should not be used in a production environment.
+
 
 %prep
 
@@ -186,7 +199,15 @@ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remo
 /etc/ostree/remotes.d/fedora.conf
 /etc/ostree/remotes.d/fedora-compose.conf
 
+%files eln
+%config(noreplace) /etc/yum.repos.d/fedora-eln.repo
+%config(noreplace) /etc/yum.repos.d/fedora-eln-modular.repo
+
+
 %changelog
+* Tue Jun 30 2020 Stephen Gallagher <sgallagh@redhat.com> - 33-0.8
+- Add optional repositories for ELN
+
 * Mon Jun 29 21:10:15 CEST 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 33-0.7
 - Split modular repos to the separate packages
 

From 49d09333bd1f17ec6dc980c418398374ec7e1d9b Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@bhujji.com>
Date: Thu, 6 Aug 2020 09:31:17 -0400
Subject: [PATCH 038/108] Adding F34 key

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
---
 RPM-GPG-KEY-fedora-34-primary | 29 +++++++++++++++++++++++++++++
 fedora-repos.spec             |  6 +++++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 RPM-GPG-KEY-fedora-34-primary

diff --git a/RPM-GPG-KEY-fedora-34-primary b/RPM-GPG-KEY-fedora-34-primary
new file mode 100644
index 0000000..42aafcd
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-34-primary
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBF8sAZIBEADKYvLg/5FdLXcVryAFd7Q8qrJq23R7ebxUT1u48Dc8xrsfYJZq
+aMcna/xw47wZNyek4Z6YpzqfmnjR7H8yRH/1hAPi/ixYnA6DVL7O3eGE5lYGJzN3
+E2ILTzBOI9o/pavvtOqW9N5WIus8cqSdA921v8YPzr3/BTKgGqC9biOrMA+3sNoe
+U4T+dztLg20SyBTr/rBH0eui2p/ipvIRuJvHLTKTubR+yG804yupI69M6qFBDebT
+rm+CBmwVyj/DY/92LgvCgYqV/TL5FU4qvtyB6jd8JkEeaz/G7UmDRB5JqzKEu6TB
+N3SY7nwLiRpIaXet1TWVW/8UKSB2JvYt1LbZyEO82/QOIXxqvV6h3kuBI21RvURz
+VxEjRlvPRGHMZ80OoAQqNPkLnVTcX1eLj2ClbwoXCmXFSm72cCCt1SzcAmlaWh8E
+rXSUZfs7XqkBrbphXHZ1e6Vxjt/RyKC5doklfOhbuF8gJ31CPo/kuOjFrHGzOwgi
+Llec+GHGMfI/cUOu59qo3W85GHsntvEMk83QLkKjBInEYjZSAajp/lS4QF+SD4pl
+Qj6Vc1mMCmci61cXX5CcIl1YxNJZzUfZEZNbUjDajqGzkYJoG9n2yJB0w4OiqsAe
+ZCirmUIeDUNeI082epc4RFuV33hByGYY9kRWSyM+aCF6PYVISj4l1o9KcQARAQAB
+tDFGZWRvcmEgKDM0KSA8ZmVkb3JhLTM0LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
+cmc+iQJOBBMBCAA4FiEEjFummQvbJuGfKhqAEWGuaUVxmjkFAl8sAZICGw8FCwkI
+BwIGFQoJCAsCBBYCAwECHgECF4AACgkQEWGuaUVxmjlVuA//QnMA02tydqwpM7r4
+WZ4OvlVqFWHhn3oDaBSwBvn6R1oC0MWbr79nnFDn3tpSkZDUdb7wyArmaF8kG8tI
+wit5xD/JAzqRBVa9z2hY3n1SFafU/hp3DwbGIL4vLUv3fRayCgWsGhGp0tZvDC9q
+PSvQZ675XpRG4pt/TGJB5gGXw7Jxoae/ffaJeblLLRDlSV/bKJt9sYpdu5InDG2i
+yIUHfamtYQtnENKL/bN6w7tU/IEgCHqxPmPRiJ0gTUAi5Yabp1+JHqskE85Hm2QF
+xMonX595Ry1yZzCjPGhCPAknJ4BhisXV+E/iV3Jyh8vxbJCo1//ygd1Xz8SkCuu/
+I0xPtFcVSIP2ikYpJwR2nwwQlLbQYIGCw/S1LV725oEYm/Z1xQ5zha2hBB+fxSwz
+7MHsD2XIHrP8NNwt3ywG3NV/BSSkvSSStGUNcQyGRi3O/x/BEIRtWRxgoNO9o3jE
+xtWFq3G5+gKY+wfYz/cTGlsWPDG7Fzx4lNisIGATKtLNqdedl7LASPK93z0XDdnS
+kfKF0HrT9rdzIKRu4xWatUVIq/65Gv7nsavdsRAQL/Y0jl6sjjQac/Te5J0fByHY
+6tGG1W0UWTd0rzFWitEZI/64/Bs83rGhjJNLqWXItZ5VqLe0TWzuxvRFLfM7oX8r
+n5Si4l7NpIJubWPqjPoCoP5lsS8=
+=V2FG
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/fedora-repos.spec b/fedora-repos.spec
index 4f8f577..6ddc5bc 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,7 +1,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        33
-Release:        0.8%{?_module_build:%{?dist}}
+Release:        0.9%{?_module_build:%{?dist}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -63,6 +63,7 @@ Source50:       RPM-GPG-KEY-fedora-30-primary
 Source51:       RPM-GPG-KEY-fedora-31-primary
 Source52:       RPM-GPG-KEY-fedora-32-primary
 Source53:       RPM-GPG-KEY-fedora-33-primary
+Source54:       RPM-GPG-KEY-fedora-34-primary
 
 Source100:      fedora-modular.repo
 Source101:      fedora-updates-modular.repo
@@ -205,6 +206,9 @@ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remo
 
 
 %changelog
+* Thu Aug 06 2020 Mohan Boddu <mboddu@bhujji.com> - 33-0.9
+- Adding F34 key
+
 * Tue Jun 30 2020 Stephen Gallagher <sgallagh@redhat.com> - 33-0.8
 - Add optional repositories for ELN
 

From 5f02f474842d23a0217c1118893f508009236c18 Mon Sep 17 00:00:00 2001
From: Tomas Hrcka <thrcka@redhat.com>
Date: Mon, 10 Aug 2020 17:29:48 +0200
Subject: [PATCH 039/108] Setup for rawhide being F34

Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
---
 archmap           | 2 ++
 fedora-repos.spec | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/archmap b/archmap
index cfd6fb7..3a83fff 100644
--- a/archmap
+++ b/archmap
@@ -70,3 +70,5 @@ fedora-31-primary: i386 x86_64 armhfp aarch64 ppc64le s390x
 fedora-32-primary: i386 x86_64 armhfp aarch64 ppc64le s390x
 
 fedora-33-primary: i386 x86_64 armhfp aarch64 ppc64le s390x
+
+fedora-34-primary: i386 x86_64 armhfp aarch64 ppc64le s390x
diff --git a/fedora-repos.spec b/fedora-repos.spec
index 6ddc5bc..dfa70c7 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,7 +1,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
-Version:        33
-Release:        0.9%{?_module_build:%{?dist}}
+Version:        34
+Release:        0.1%{?_module_build:%{?dist}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -206,6 +206,9 @@ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remo
 
 
 %changelog
+* Mon Aug 10 2020 Tomas Hrcka <thrcka@redhat.com> - 34-0.1
+- Setup for rawhide being F34
+
 * Thu Aug 06 2020 Mohan Boddu <mboddu@bhujji.com> - 33-0.9
 - Adding F34 key
 

From b59bbce1e6d9836cbae0518951c6452ca8f6183c Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Wed, 19 Aug 2020 09:15:46 -0400
Subject: [PATCH 040/108] Enable rebuilding for ELN

Also drops the %dist override for module builds, which was a remnant
of Modularity 1.0. It is not needed with the current implementation,
since we expect the platform to be non-modular.

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
---
 fedora-repos.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index dfa70c7..14be8a1 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,7 +1,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        34
-Release:        0.1%{?_module_build:%{?dist}}
+Release:        0.2%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -206,6 +206,10 @@ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remo
 
 
 %changelog
+* Wed Aug 19 2020 Stephen Gallagher <sgallagh@redhat.com> - 34-0.2
+- Enable rebuilding of fedora-repos in ELN
+- Drop unused modularity-specific release information
+
 * Mon Aug 10 2020 Tomas Hrcka <thrcka@redhat.com> - 34-0.1
 - Setup for rawhide being F34
 

From 59edd28f1ffc30fd65dfdb48c38a61a301dbd281 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Fri, 21 Aug 2020 19:30:25 +0200
Subject: [PATCH 041/108] Fix a copy-paste error in eln repo name
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Miro Hrončok <miro@hroncok.cz>
---
 fedora-eln.repo   | 2 +-
 fedora-repos.spec | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/fedora-eln.repo b/fedora-eln.repo
index 1b02c9b..3e42308 100644
--- a/fedora-eln.repo
+++ b/fedora-eln.repo
@@ -20,7 +20,7 @@
 # Version: eln
 
 [eln]
-name=Fedora - ELN - Developmental modular packages for the next Enterprise Linux release
+name=Fedora - ELN - Developmental packages for the next Enterprise Linux release
 baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Everything/$basearch/os/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
 enabled=1
diff --git a/fedora-repos.spec b/fedora-repos.spec
index 14be8a1..cca548c 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,7 +1,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        34
-Release:        0.2%{?eln:.eln%{eln}}
+Release:        0.3%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -206,6 +206,9 @@ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remo
 
 
 %changelog
+* Fri Aug 21 2020 Miro Hrončok <mhroncok@redhat.com> - 34-0.3
+- Fix a copy-paste error in eln repo name
+
 * Wed Aug 19 2020 Stephen Gallagher <sgallagh@redhat.com> - 34-0.2
 - Enable rebuilding of fedora-repos in ELN
 - Drop unused modularity-specific release information

From d465ebe9fcef8ccb54c7fe728771f13b5c73f1d4 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Sat, 22 Aug 2020 10:41:21 -0700
Subject: [PATCH 042/108] Drop fedora-modular.repo from base package as it's
 also in the modular subpackage

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 fedora-repos.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index cca548c..cbcdf5c 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -173,7 +173,6 @@ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remo
 %files
 %dir /etc/yum.repos.d
 %config(noreplace) /etc/yum.repos.d/fedora.repo
-%config(noreplace) /etc/yum.repos.d/fedora-modular.repo
 %config(noreplace) /etc/yum.repos.d/fedora-cisco-openh264.repo
 %config(noreplace) /etc/yum.repos.d/fedora-updates.repo
 %config(noreplace) /etc/yum.repos.d/fedora-updates-testing.repo
@@ -208,6 +207,8 @@ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remo
 %changelog
 * Fri Aug 21 2020 Miro Hrončok <mhroncok@redhat.com> - 34-0.3
 - Fix a copy-paste error in eln repo name
+- Drop fedora-modular from base package since it's in the modular subpackage
+- Fixes: rhbz#1869150
 
 * Wed Aug 19 2020 Stephen Gallagher <sgallagh@redhat.com> - 34-0.2
 - Enable rebuilding of fedora-repos in ELN

From 51f622a8ca8faa70e5405968e10355c6104d457a Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Mon, 5 Oct 2020 14:19:54 -0400
Subject: [PATCH 043/108] Add the fedora-repos-archive subpackage.

This should aid our efforts to make package layering more reliable in
OSTree based Editions. See:

- https://github.com/coreos/fedora-coreos-tracker/issues/400
- https://github.com/coreos/fedora-coreos-tracker/issues/401
- https://pagure.io/releng/issue/9717
- https://lists.fedoraproject.org/archives/list/iot@lists.fedoraproject.org/thread/QZFVKH2SMHJNIZS2M4U25CHJOZXIKLWG/

Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
---
 fedora-repos.spec           | 18 +++++++++++++++++-
 fedora-updates-archive.repo | 22 ++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 fedora-updates-archive.repo

diff --git a/fedora-repos.spec b/fedora-repos.spec
index cbcdf5c..afe97da 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,7 +1,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        34
-Release:        0.3%{?eln:.eln%{eln}}
+Release:        0.4%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -18,6 +18,7 @@ Source3:        fedora-updates.repo
 Source4:        fedora-updates-testing.repo
 Source5:        fedora-rawhide.repo
 Source6:        fedora-cisco-openh264.repo
+Source7:        fedora-updates-archive.repo
 
 Source10:       RPM-GPG-KEY-fedora-7-primary
 Source11:       RPM-GPG-KEY-fedora-8-primary
@@ -95,6 +96,15 @@ Summary:        Rawhide repo definitions
 Requires:       fedora-repos = %{version}-%{release}
 Obsoletes:      fedora-repos-rawhide < 33-0.7
 
+%package archive
+Summary:        Fedora updates archive package repository
+Requires:       fedora-repos = %{version}-%{release}
+
+%description archive
+This package provides the repo definition for the updates archive repo.
+It is a package repository that contains any RPM that has made it to
+stable in Bodhi and been available in the Fedora updates repo in the past.
+
 %description rawhide
 This package provides the rawhide repo definitions.
 
@@ -182,6 +192,9 @@ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remo
 %config(noreplace) /etc/yum.repos.d/fedora-updates-modular.repo
 %config(noreplace) /etc/yum.repos.d/fedora-updates-testing-modular.repo
 
+%files archive
+%config(noreplace) /etc/yum.repos.d/fedora-updates-archive.repo
+
 %files rawhide
 %config(noreplace) /etc/yum.repos.d/fedora-rawhide.repo
 
@@ -205,6 +218,9 @@ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remo
 
 
 %changelog
+* Mon Oct 05 2020 Dusty Mabe <dusty@dustymabe.com> - 34-0.4
+- Add the fedora-repos-archive subpackage.
+
 * Fri Aug 21 2020 Miro Hrončok <mhroncok@redhat.com> - 34-0.3
 - Fix a copy-paste error in eln repo name
 - Drop fedora-modular from base package since it's in the modular subpackage
diff --git a/fedora-updates-archive.repo b/fedora-updates-archive.repo
new file mode 100644
index 0000000..4cc3551
--- /dev/null
+++ b/fedora-updates-archive.repo
@@ -0,0 +1,22 @@
+# This is a repo that contains all the old update packages from the
+# Fedora updates yum repository (i.e. the packages that have made it
+# to "stable"). This repo is needed for OSTree based systems where users
+# may be trying to layer packages on top of a base layer that doesn't
+# have the latest stable content. Since base layer content is locked
+# the package layering operation will fail unless there are older versions
+# of packages available.
+#
+# This repo is given a high cost in order to prefer the normal Fedora
+# yum repositories, which means only packages that can't be found
+# elsewhere will be downloaded from here.
+[updates-archive]
+name=Fedora $releasever - $basearch - Updates Archive
+baseurl=https://fedoraproject-updates-archive.fedoraproject.org/fedora/$releasever/$basearch/
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=True
+cost=10000 # default is 1000

From e7109fe9e52cc697961fdf3230d43f202aadc5bb Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Thu, 8 Oct 2020 13:51:21 -0400
Subject: [PATCH 044/108] Update ELN repos to include BaseOS and AppStream
 repositories

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
---
 fedora-eln.repo   | 56 ++++++++++++++++++++++++++++++++++++++---------
 fedora-repos.spec |  5 ++++-
 2 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/fedora-eln.repo b/fedora-eln.repo
index 3e42308..c81fbe4 100644
--- a/fedora-eln.repo
+++ b/fedora-eln.repo
@@ -18,10 +18,9 @@
 #
 # Product: Fedora
 # Version: eln
-
-[eln]
-name=Fedora - ELN - Developmental packages for the next Enterprise Linux release
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Everything/$basearch/os/
+[eln-baseos]
+name=Fedora - ELN BaseOS - Developmental packages for the next Enterprise Linux release
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/BaseOS/$basearch/os/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
 enabled=1
 countme=1
@@ -32,9 +31,9 @@ gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 skip_if_unavailable=False
 
-[eln-debuginfo]
-name=Fedora - ELN - Debug
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Everything/x86_64/debug/tree
+[eln-baseos-debuginfo]
+name=Fedora - ELN BaseOS - Debug
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/BaseOS/$basearch/debug/tree
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -43,9 +42,46 @@ gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 skip_if_unavailable=False
 
-[eln-source]
-name=Fedora - ELN - Source
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Everything/source/tree/
+[eln-baseos-source]
+name=Fedora - ELN BaseOS - Source
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/BaseOS/source/tree/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
+enabled=0
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
+
+
+[eln-appstream]
+name=Fedora - ELN AppStream - Developmental packages for the next Enterprise Linux release
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/AppStream/$basearch/os/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
+enabled=1
+countme=1
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
+[eln-appstream-debuginfo]
+name=Fedora - ELN AppStream - Debug
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/AppStream/$basearch/debug/tree
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
+enabled=0
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
+[eln-appstream-source]
+name=Fedora - ELN AppStream - Source
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/AppStream/source/tree/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
 enabled=0
 repo_gpgcheck=0
diff --git a/fedora-repos.spec b/fedora-repos.spec
index afe97da..2c5eabb 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,7 +1,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        34
-Release:        0.4%{?eln:.eln%{eln}}
+Release:        0.5%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -218,6 +218,9 @@ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remo
 
 
 %changelog
+* Thu Oct 08 2020 Stephen Gallagher <sgallagh@redhat.com> - 34-0.5
+- Update the ELN repos for the BaseOS and AppStream split
+
 * Mon Oct 05 2020 Dusty Mabe <dusty@dustymabe.com> - 34-0.4
 - Add the fedora-repos-archive subpackage.
 

From 4ef16d78e4bf34df78b50cbd4a152956ea408439 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Tue, 13 Oct 2020 10:25:36 -0400
Subject: [PATCH 045/108] Drop the fedora-eln-modular.repo

It no longer exists and the fedora-eln.repo package now contains
both BaseOS and AppStream repositories for ELN.

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
---
 fedora-eln-modular.repo | 56 -----------------------------------------
 fedora-repos.spec       | 11 ++++----
 2 files changed, 6 insertions(+), 61 deletions(-)
 delete mode 100644 fedora-eln-modular.repo

diff --git a/fedora-eln-modular.repo b/fedora-eln-modular.repo
deleted file mode 100644
index 5c1165a..0000000
--- a/fedora-eln-modular.repo
+++ /dev/null
@@ -1,56 +0,0 @@
-# These packages are untested and still under development. This
-# repository is used for development of new releases.
-#
-# This repository can see significant daily turnover and major
-# functionality changes which cause unexpected problems with other
-# development packages. Please use these packages if you want to work
-# with the Fedora developers by testing these new development packages.
-#
-# # https://admin.fedoraproject.org/mailman/listinfo/test (Subscription
-# Required) is available as a discussion forum for
-# testing and troubleshooting for development packages in conjunction
-# with new test releases.
-#
-# More information is available at http://fedoraproject.org/wiki/Testing 
-#
-# Reproducible and reportable issues should be filed at
-# http://bugzilla.redhat.com/.
-#
-# Product: Fedora
-# Version: eln-modular
-
-[eln-modular]
-name=Fedora - Modular ELN - Developmental modular packages for the next Enterprise Linux release
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Modular/$basearch/os/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-modular&arch=$basearch
-enabled=1
-countme=1
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[eln-modular-debuginfo]
-name=Fedora - Modular ELN - Debug
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Modular/x86_64/debug/tree
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-modular-debug&arch=$basearch
-enabled=0
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[eln-modular-source]
-name=Fedora - Modular ELN - Source
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Modular/source/tree/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-modular-source&arch=$basearch
-enabled=0
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
diff --git a/fedora-repos.spec b/fedora-repos.spec
index 2c5eabb..394102c 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,7 +1,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        34
-Release:        0.5%{?eln:.eln%{eln}}
+Release:        0.6%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -19,6 +19,8 @@ Source4:        fedora-updates-testing.repo
 Source5:        fedora-rawhide.repo
 Source6:        fedora-cisco-openh264.repo
 Source7:        fedora-updates-archive.repo
+Source8:        fedora-eln.repo
+
 
 Source10:       RPM-GPG-KEY-fedora-7-primary
 Source11:       RPM-GPG-KEY-fedora-8-primary
@@ -76,9 +78,6 @@ Source150:      RPM-GPG-KEY-fedora-iot-2019
 Source151:      fedora.conf
 Source152:      fedora-compose.conf
 
-Source200:      fedora-eln.repo
-Source201:      fedora-eln-modular.repo
-
 %description
 Fedora package repository files for yum and dnf along with gpg public keys.
 
@@ -214,10 +213,12 @@ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remo
 
 %files eln
 %config(noreplace) /etc/yum.repos.d/fedora-eln.repo
-%config(noreplace) /etc/yum.repos.d/fedora-eln-modular.repo
 
 
 %changelog
+* Tue Oct 13 2020 Stephen Gallagher <sgallagh@redhat.com> - 34-0.6
+- Drop the fedora-eln-modular.repo
+
 * Thu Oct 08 2020 Stephen Gallagher <sgallagh@redhat.com> - 34-0.5
 - Update the ELN repos for the BaseOS and AppStream split
 

From 52fdff9e4c3d721fcd79cfd9b6dddd5fa1dd23c2 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Tue, 13 Oct 2020 10:58:33 -0400
Subject: [PATCH 046/108] Add ELN GPG keys

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
---
 archmap           | 2 ++
 fedora-repos.spec | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/archmap b/archmap
index 3a83fff..2f862a0 100644
--- a/archmap
+++ b/archmap
@@ -72,3 +72,5 @@ fedora-32-primary: i386 x86_64 armhfp aarch64 ppc64le s390x
 fedora-33-primary: i386 x86_64 armhfp aarch64 ppc64le s390x
 
 fedora-34-primary: i386 x86_64 armhfp aarch64 ppc64le s390x
+
+fedora-eln-primary: i386 x86_64 aarch64 ppc64le s390x
diff --git a/fedora-repos.spec b/fedora-repos.spec
index 394102c..24a8202 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -156,6 +156,8 @@ install -m 644 %{_sourcedir}/RPM-GPG-KEY* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
 #     says "fedora-19-primary: i386 x86_64",
 #     RPM-GPG-KEY-fedora-19-{i386,x86_64} will be symlinked to that key.
 pushd $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
+# Also add a symlink for ELN keys
+ln -s RPM-GPG-KEY-fedora-%{version}-primary RPM-GPG-KEY-fedora-eln-primary
 for keyfile in RPM-GPG-KEY*; do
     key=${keyfile#RPM-GPG-KEY-} # e.g. 'fedora-20-primary'
     arches=$(sed -ne "s/^${key}://p" %{_sourcedir}/archmap) \

From ed37c7b7c3ba1fca017702961e156bdcc79b1d2e Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Tue, 13 Oct 2020 16:02:47 -0400
Subject: [PATCH 047/108] Add %rawhide_release variable to identify GPG keys

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
---
 fedora-repos.spec | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index 24a8202..9aee6a2 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,3 +1,5 @@
+%global rawhide_release 34
+
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        34
@@ -157,7 +159,7 @@ install -m 644 %{_sourcedir}/RPM-GPG-KEY* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
 #     RPM-GPG-KEY-fedora-19-{i386,x86_64} will be symlinked to that key.
 pushd $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
 # Also add a symlink for ELN keys
-ln -s RPM-GPG-KEY-fedora-%{version}-primary RPM-GPG-KEY-fedora-eln-primary
+ln -s RPM-GPG-KEY-fedora-%{rawhide_release}-primary RPM-GPG-KEY-fedora-eln-primary
 for keyfile in RPM-GPG-KEY*; do
     key=${keyfile#RPM-GPG-KEY-} # e.g. 'fedora-20-primary'
     arches=$(sed -ne "s/^${key}://p" %{_sourcedir}/archmap) \

From 2de31855f1e2349b9f2f067947e76a2c8939edff Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Tue, 13 Oct 2020 16:06:13 -0400
Subject: [PATCH 048/108] Update the release and changelog

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
---
 fedora-repos.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index 9aee6a2..300260b 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -3,7 +3,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        34
-Release:        0.6%{?eln:.eln%{eln}}
+Release:        0.7%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -220,6 +220,9 @@ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remo
 
 
 %changelog
+* Tue Oct 13 2020 Stephen Gallagher <sgallagh@redhat.com> - 34-0.7
+- Ensure that the ELN GPG key always points at the Rawhide key
+
 * Tue Oct 13 2020 Stephen Gallagher <sgallagh@redhat.com> - 34-0.6
 - Drop the fedora-eln-modular.repo
 

From 827881bc225ee3067ab32d65d29789d484f46819 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Tue, 13 Oct 2020 22:32:56 +0200
Subject: [PATCH 049/108] Simplify spec changes upon branching (the repo files
 still need to be changed)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Miro Hrončok <miro@hroncok.cz>
---
 fedora-repos.spec | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index 300260b..9bc24f3 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -10,7 +10,9 @@ URL:            https://fedoraproject.org/
 Provides:       fedora-repos(%{version}) = %{release}
 Requires:       system-release(%{version})
 Obsoletes:      fedora-repos < 33-0.7
+%if %{rawhide_release} == %{version}
 Requires:       fedora-repos-rawhide = %{version}-%{release}
+%endif
 Requires:       fedora-gpg-keys >= %{version}-%{release}
 BuildArch:      noarch
 
@@ -86,7 +88,9 @@ Fedora package repository files for yum and dnf along with gpg public keys.
 %package modular
 Summary:        Fedora modular package repositories
 Requires:       fedora-repos = %{version}-%{release}
+%if %{rawhide_release} == %{version}
 Requires:       fedora-repos-rawhide-modular = %{version}-%{release}
+%endif
 Obsoletes:      fedora-repos < 33-0.7
 
 %description modular

From bf9a6311f0b87f3600b7ba0d6dc457f7700ac7a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Tue, 13 Oct 2020 22:39:29 +0200
Subject: [PATCH 050/108] Assert all rawhide/eln repos are set to enabled when
 this is rawhide
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Miro Hrončok <miro@hroncok.cz>
---
 fedora-repos.spec | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index 9bc24f3..422ef49 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -187,6 +187,18 @@ install -d -m 755 $RPM_BUILD_ROOT/etc/ostree/remotes.d/
 install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/
 install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/
 
+
+%check
+# assert all rawhide/eln repos are set to enabled only when this is rawhide
+for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-{rawhide,eln}*.repo; do
+  %if %{rawhide_release} == %{version}
+    grep 'enabled=1' $repo
+  %else
+    grep 'enabled=1' $repo && exit 1
+  %endif
+done
+
+
 %files
 %dir /etc/yum.repos.d
 %config(noreplace) /etc/yum.repos.d/fedora.repo

From 01f9f3e5ad8d1c4316a94edd1507e60ebf7b6da4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Wed, 14 Oct 2020 11:30:30 +0200
Subject: [PATCH 051/108] Fixup assertion on non-rawhide
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Miro Hrončok <miro@hroncok.cz>
---
 fedora-repos.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index 422ef49..e0e03e7 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -194,7 +194,7 @@ for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-{rawhide,eln}*.repo; do
   %if %{rawhide_release} == %{version}
     grep 'enabled=1' $repo
   %else
-    grep 'enabled=1' $repo && exit 1
+    grep 'enabled=1' $repo && exit 1 || :
   %endif
 done
 

From 856d184a13a85435f77881e314a19520209fdc73 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Wed, 14 Oct 2020 09:45:16 -0400
Subject: [PATCH 052/108] ELN: Drop dependency on fedora-repos-rawhide-modular

Modules for ELN are not compatible with modules for Rawhide due
to a different `platform` module definition.

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
---
 fedora-repos.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index e0e03e7..9ccb770 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -3,7 +3,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        34
-Release:        0.7%{?eln:.eln%{eln}}
+Release:        0.8%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -140,7 +140,6 @@ where client's system will pull OSTree updates.
 %package eln
 Summary: ELN repo definitions
 Requires: fedora-repos-rawhide = %{version}-%{release}
-Requires: fedora-repos-rawhide-modular = %{version}-%{release}
 
 %description eln
 This package provides repository files for ELN (Enterprise Linux Next)
@@ -236,6 +235,9 @@ done
 
 
 %changelog
+* Wed Oct 14 2020 Stephen Gallagher <sgallagh@redhat.com> - 34-0.8
+- ELN: Drop dependency on fedora-repos-rawhide-modular
+
 * Tue Oct 13 2020 Stephen Gallagher <sgallagh@redhat.com> - 34-0.7
 - Ensure that the ELN GPG key always points at the Rawhide key
 

From 741f93f2edd92c0efd7241d965aa94bbe1bc14f5 Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@bhujji.com>
Date: Thu, 4 Feb 2021 16:21:23 -0500
Subject: [PATCH 053/108] Adding F35 key

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
---
 RPM-GPG-KEY-fedora-35-primary | 29 +++++++++++++++++++++++++++++
 fedora-repos.spec             |  6 +++++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 RPM-GPG-KEY-fedora-35-primary

diff --git a/RPM-GPG-KEY-fedora-35-primary b/RPM-GPG-KEY-fedora-35-primary
new file mode 100644
index 0000000..899affa
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-35-primary
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGAcScoBEADLf8YHkezJ6adlMYw7aGGIlJalt8Jj2x/B2K+hIfIuxGtpVj7e
+LRgDU76jaT5pVD5mFMJ3pkeneR/cTmqqQkNyQshX2oQXwEzUSb1CNMCfCGgkX8Q2
+zZkrIcCrF0Q2wrKblaudhU+iVanADsm18YEqsb5AU37dtUrM3QYdWg9R+XiPfV8R
+KBjT03vVBOdMSsY39LaCn6Ip1Ovp8IEo/IeEVY1qmCOPAaK0bJH3ufg4Cueks+TS
+wQWTeCLxuZL6OMXoOPKwvMQfxbg1XD8vuZ0Ktj/cNH2xau0xmsAu9HJpekvOPRxl
+yqtjyZfroVieFypwZgvQwtnnM8/gSEu/JVTrY052mEUT7Ccb74kcHFTFfMklnkG/
+0fU4ARa504H3xj0ktbe3vKcPXoPOuKBVsHSv00UGYAyPeuy+87cU/YEhM7k3SVKj
+6eIZgyiMO0wl1YGDRKculwks9A+ulkg1oTb4s3zmZvP07GoTxW42jaK5WS+NhZee
+860XoVhbc1KpS+jfZojsrEtZ8PbUZ+YvF8RprdWArjHbJk2JpRKAxThxsQAsBhG1
+0Lux2WaMB0g2I5PcMdJ/cqjo08ccrjBXuixWri5iu9MXp8qT/fSzNmsdIgn8/qZK
+i8Qulfu77uqhW/wt2btnitgRsqjhxMujYU4Zb4hktF8hKU/XX742qhL5KwARAQAB
+tDFGZWRvcmEgKDM1KSA8ZmVkb3JhLTM1LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
+cmc+iQJOBBMBCAA4FiEEeH6mrhFH7uVsQLMM20Y5cZhnxY8FAmAcScoCGw8FCwkI
+BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ20Y5cZhnxY+NYA/7BYpglySAZYHhjyKh
+/+f6zPfVvbH20Eq3kI7OFBN0nLX+BU1muvS+qTuS3WLrB3m3GultpKREJKLtm5ED
+1rGzXAoT1yp9YI8LADdMCCOyjAjsoWU87YUuC+/bnjrTeR2LROCfyPC76W985iOV
+m5S+bsQDw7C2LrldAM4MDuoyZ1SitGaZ4KQLVt+TEa14isYSGCjzo7PY8V3JOk50
+gqWg82N/bm2EzS7T83WEDb1lvj4IlvxgIqKeg11zXYxmrYSZJJCfvzf+lNS6uxgH
+jx/J0ylZ2LibGr6GAAyO9UWrAZSwSM0EcjT8wECnxkSDuyqmWwVvNBXuEIV8Oe3Y
+MiU1fJN8sd7DpsFx5M+XdnMnQS+HrjTPKD3mWrlAdnEThdYV8jZkpWhDys3/99eO
+hk0rLny0jNwkauf/iU8Oc6XvMkjLRMJg5U9VKyJuWWtzwXnjMN5WRFBqK4sZomMM
+ftbTH1+5ybRW/A3vBbaxRW2t7UzNjczekSZEiaLN9L/HcJCIR1QF8682DdAlEF9d
+k2gQiYSQAaaJ0JJAzHvRkRJLLgK2YQYiHNVy2t3JyFfsram5wSCWOfhPeIyLBTZJ
+vrpNlPbefsT957Tf2BNIugzZrC5VxDSKkZgRh1VGvSIQnCyzkQy6EU2qPpiW59G/
+hPIXZrKocK3KLS9/izJQTRltjMA=
+=PfT7
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/fedora-repos.spec b/fedora-repos.spec
index 9ccb770..0d397b3 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -3,7 +3,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        34
-Release:        0.8%{?eln:.eln%{eln}}
+Release:        0.9%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -71,6 +71,7 @@ Source51:       RPM-GPG-KEY-fedora-31-primary
 Source52:       RPM-GPG-KEY-fedora-32-primary
 Source53:       RPM-GPG-KEY-fedora-33-primary
 Source54:       RPM-GPG-KEY-fedora-34-primary
+Source55:       RPM-GPG-KEY-fedora-35-primary
 
 Source100:      fedora-modular.repo
 Source101:      fedora-updates-modular.repo
@@ -235,6 +236,9 @@ done
 
 
 %changelog
+* Thu Feb 04 2021 Mohan Boddu <mboddu@bhujji.com> - 34-0.9
+- Adding F35 key
+
 * Wed Oct 14 2020 Stephen Gallagher <sgallagh@redhat.com> - 34-0.8
 - ELN: Drop dependency on fedora-repos-rawhide-modular
 

From f4fbfae2b22738bad5ac1fa4b6497e8c9ab94ce4 Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@bhujji.com>
Date: Tue, 9 Feb 2021 09:32:57 -0500
Subject: [PATCH 054/108] Fixing archmap for F35

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
---
 archmap           | 2 ++
 fedora-repos.spec | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/archmap b/archmap
index 2f862a0..e80ecbd 100644
--- a/archmap
+++ b/archmap
@@ -73,4 +73,6 @@ fedora-33-primary: i386 x86_64 armhfp aarch64 ppc64le s390x
 
 fedora-34-primary: i386 x86_64 armhfp aarch64 ppc64le s390x
 
+fedora-35-primary: x86_64 armhfp aarch64 ppc64le s390x
+
 fedora-eln-primary: i386 x86_64 aarch64 ppc64le s390x
diff --git a/fedora-repos.spec b/fedora-repos.spec
index 0d397b3..63e0f32 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -3,7 +3,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        34
-Release:        0.9%{?eln:.eln%{eln}}
+Release:        0.10%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -236,6 +236,9 @@ done
 
 
 %changelog
+* Tue Feb 09 2021 Mohan Boddu <mboddu@bhujji.com> - 34-0.10
+- Fixing archmap for F35
+
 * Thu Feb 04 2021 Mohan Boddu <mboddu@bhujji.com> - 34-0.9
 - Adding F35 key
 

From ad741a9bb8033cf36720609276773d3387b36892 Mon Sep 17 00:00:00 2001
From: Tomas Hrcka <thrcka@redhat.com>
Date: Tue, 9 Feb 2021 21:21:03 +0100
Subject: [PATCH 055/108] Setup for rawhide being F35

Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
---
 fedora-repos.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index 63e0f32..c1c7f4e 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,9 +1,9 @@
-%global rawhide_release 34
+%global rawhide_release 35
 
 Summary:        Fedora package repositories
 Name:           fedora-repos
-Version:        34
-Release:        0.10%{?eln:.eln%{eln}}
+Version:        35
+Release:        0.1%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -236,6 +236,9 @@ done
 
 
 %changelog
+* Tue Feb 09 2021 Tomas Hrcka <thrcka@redhat.com> - 35-0.1
+- Setup for rawhide being F35
+
 * Tue Feb 09 2021 Mohan Boddu <mboddu@bhujji.com> - 34-0.10
 - Fixing archmap for F35
 

From dac6fcdf6c063f1e049ddc7b33f3b299bb643d7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20P=C3=A1ral?= <kparal@redhat.com>
Date: Fri, 12 Feb 2021 12:35:11 +0100
Subject: [PATCH 056/108] support $releasever=rawhide on Rawhide

This commit is necessary to support a fedora-release change which makes
$releasever return "rawhide" on Rawhide (please read that commit first [1]).

The most important change here is the introduction of the
`RPM-GPG-KEY-fedora-rawhide-primary` symlink to the current (numbered) Rawhide
key. This is necessary because $releasever resolves to "rawhide" now and
therefore the file must be present under the "rawhide" name.

There's an additional change present, which seemed related enough to include it
in the same commit - the Fedora 36 GPG key is added and it is referenced in
Rawhide repo files. The purpose is to have a reliable update process which
doesn't break just because users didn't update their system in a month (and
therefore missed the window during which gpg keys are changed). This problem
might be even more pronounced after this patch and therefore should be addressed
together. The fix also paves way for future simplification of fedora-repos (no
need for separate rawhide repo files, perhaps).

Additional checks have been added to reduce the likelihood of human errors when
Rawhide number is bumped.

[1] https://src.fedoraproject.org/rpms/fedora-release/pull-request/167

Related: https://pagure.io/releng/issue/7445
Related: https://src.fedoraproject.org/rpms/fedora-release/pull-request/167
---
 RPM-GPG-KEY-fedora-36-primary | 29 ++++++++++++++++++++++++
 archmap                       |  4 ++++
 fedora-repos.spec             | 42 +++++++++++++++++++++++++++++++++--
 3 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 RPM-GPG-KEY-fedora-36-primary

diff --git a/RPM-GPG-KEY-fedora-36-primary b/RPM-GPG-KEY-fedora-36-primary
new file mode 100644
index 0000000..899affa
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-36-primary
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGAcScoBEADLf8YHkezJ6adlMYw7aGGIlJalt8Jj2x/B2K+hIfIuxGtpVj7e
+LRgDU76jaT5pVD5mFMJ3pkeneR/cTmqqQkNyQshX2oQXwEzUSb1CNMCfCGgkX8Q2
+zZkrIcCrF0Q2wrKblaudhU+iVanADsm18YEqsb5AU37dtUrM3QYdWg9R+XiPfV8R
+KBjT03vVBOdMSsY39LaCn6Ip1Ovp8IEo/IeEVY1qmCOPAaK0bJH3ufg4Cueks+TS
+wQWTeCLxuZL6OMXoOPKwvMQfxbg1XD8vuZ0Ktj/cNH2xau0xmsAu9HJpekvOPRxl
+yqtjyZfroVieFypwZgvQwtnnM8/gSEu/JVTrY052mEUT7Ccb74kcHFTFfMklnkG/
+0fU4ARa504H3xj0ktbe3vKcPXoPOuKBVsHSv00UGYAyPeuy+87cU/YEhM7k3SVKj
+6eIZgyiMO0wl1YGDRKculwks9A+ulkg1oTb4s3zmZvP07GoTxW42jaK5WS+NhZee
+860XoVhbc1KpS+jfZojsrEtZ8PbUZ+YvF8RprdWArjHbJk2JpRKAxThxsQAsBhG1
+0Lux2WaMB0g2I5PcMdJ/cqjo08ccrjBXuixWri5iu9MXp8qT/fSzNmsdIgn8/qZK
+i8Qulfu77uqhW/wt2btnitgRsqjhxMujYU4Zb4hktF8hKU/XX742qhL5KwARAQAB
+tDFGZWRvcmEgKDM1KSA8ZmVkb3JhLTM1LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
+cmc+iQJOBBMBCAA4FiEEeH6mrhFH7uVsQLMM20Y5cZhnxY8FAmAcScoCGw8FCwkI
+BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ20Y5cZhnxY+NYA/7BYpglySAZYHhjyKh
+/+f6zPfVvbH20Eq3kI7OFBN0nLX+BU1muvS+qTuS3WLrB3m3GultpKREJKLtm5ED
+1rGzXAoT1yp9YI8LADdMCCOyjAjsoWU87YUuC+/bnjrTeR2LROCfyPC76W985iOV
+m5S+bsQDw7C2LrldAM4MDuoyZ1SitGaZ4KQLVt+TEa14isYSGCjzo7PY8V3JOk50
+gqWg82N/bm2EzS7T83WEDb1lvj4IlvxgIqKeg11zXYxmrYSZJJCfvzf+lNS6uxgH
+jx/J0ylZ2LibGr6GAAyO9UWrAZSwSM0EcjT8wECnxkSDuyqmWwVvNBXuEIV8Oe3Y
+MiU1fJN8sd7DpsFx5M+XdnMnQS+HrjTPKD3mWrlAdnEThdYV8jZkpWhDys3/99eO
+hk0rLny0jNwkauf/iU8Oc6XvMkjLRMJg5U9VKyJuWWtzwXnjMN5WRFBqK4sZomMM
+ftbTH1+5ybRW/A3vBbaxRW2t7UzNjczekSZEiaLN9L/HcJCIR1QF8682DdAlEF9d
+k2gQiYSQAaaJ0JJAzHvRkRJLLgK2YQYiHNVy2t3JyFfsram5wSCWOfhPeIyLBTZJ
+vrpNlPbefsT957Tf2BNIugzZrC5VxDSKkZgRh1VGvSIQnCyzkQy6EU2qPpiW59G/
+hPIXZrKocK3KLS9/izJQTRltjMA=
+=PfT7
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/archmap b/archmap
index e80ecbd..e4793c4 100644
--- a/archmap
+++ b/archmap
@@ -75,4 +75,8 @@ fedora-34-primary: i386 x86_64 armhfp aarch64 ppc64le s390x
 
 fedora-35-primary: x86_64 armhfp aarch64 ppc64le s390x
 
+fedora-36-primary: x86_64 armhfp aarch64 ppc64le s390x
+
+fedora-rawhide-primary: x86_64 armhfp aarch64 ppc64le s390x
+
 fedora-eln-primary: i386 x86_64 aarch64 ppc64le s390x
diff --git a/fedora-repos.spec b/fedora-repos.spec
index c1c7f4e..12f2597 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -3,7 +3,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        35
-Release:        0.1%{?eln:.eln%{eln}}
+Release:        0.10%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -72,6 +72,10 @@ Source52:       RPM-GPG-KEY-fedora-32-primary
 Source53:       RPM-GPG-KEY-fedora-33-primary
 Source54:       RPM-GPG-KEY-fedora-34-primary
 Source55:       RPM-GPG-KEY-fedora-35-primary
+Source56:       RPM-GPG-KEY-fedora-36-primary
+# When bumping Rawhide to fN, create N+1 key (and update archmap). (This
+# ensures users have the next future key installed and referenced, even if they
+# don't update very often. This will smooth out Rawhide N->N+1 transition for them).
 
 Source100:      fedora-modular.repo
 Source101:      fedora-updates-modular.repo
@@ -162,7 +166,8 @@ install -m 644 %{_sourcedir}/RPM-GPG-KEY* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
 #     says "fedora-19-primary: i386 x86_64",
 #     RPM-GPG-KEY-fedora-19-{i386,x86_64} will be symlinked to that key.
 pushd $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
-# Also add a symlink for ELN keys
+# Also add a symlink for Rawhide and ELN keys
+ln -s RPM-GPG-KEY-fedora-%{rawhide_release}-primary RPM-GPG-KEY-fedora-rawhide-primary
 ln -s RPM-GPG-KEY-fedora-%{rawhide_release}-primary RPM-GPG-KEY-fedora-eln-primary
 for keyfile in RPM-GPG-KEY*; do
     key=${keyfile#RPM-GPG-KEY-} # e.g. 'fedora-20-primary'
@@ -177,6 +182,17 @@ done
 ln -s RPM-GPG-KEY-fedora-%{version}-primary RPM-GPG-KEY-%{version}-fedora
 popd
 
+# Adjust Rawhide repo files to include Rawhide+1 GPG key.
+# This is necessary for the period when Rawhide gets bumped to N+1 and packages
+# start to be signed with a newer key. Without having the key specified in the
+# repo file, the system would consider the new packages as untrusted.
+rawhide_next=$((%{rawhide_release}+1))
+for repo in %{_sourcedir}/fedora-rawhide*.repo; do
+    sed -ir "s@^gpgkey=.*@& file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-${rawhide_next}-\$basearch@" \
+        $repo || exit 1
+done
+
+# Install repo files
 install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
 for file in %{_sourcedir}/fedora*repo ; do
   install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d
@@ -198,6 +214,28 @@ for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-{rawhide,eln}*.repo; do
   %endif
 done
 
+# make sure the Rawhide+1 key wasn't forgotten to be created
+rawhide_next=$((%{rawhide_release}+1))
+if ! test -f $RPM_BUILD_ROOT/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-${rawhide_next}-primary; then
+    echo "ERROR: GPG key for Fedora ${rawhide_next} is not present"
+    exit 1
+fi
+
+# make sure the Rawhide+1 key is present in Rawhide repo files
+for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-rawhide*.repo; do
+    gpg_lines=$(grep '^gpgkey=' $repo)
+    if test -z "$gpg_lines"; then
+        echo "ERROR: No gpgkey= lines in $repo"
+        exit 1
+    fi
+    while IFS= read -r line; do
+        if ! echo "$line" | grep -q "RPM-GPG-KEY-fedora-${rawhide_next}"; then
+            echo "ERROR: Fedora ${rawhide_next} GPG key missing in $repo"
+            exit 1
+        fi
+    done <<< "$gpg_lines"
+done
+
 
 %files
 %dir /etc/yum.repos.d

From f1cc1f21d118ddae9f09120d862c18cd1a04e774 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20P=C3=A1ral?= <kparal@redhat.com>
Date: Fri, 12 Feb 2021 12:43:21 +0100
Subject: [PATCH 057/108] make archmap entries mandatory, except symlinks

All GPG keys except symlinks must now have an entry in archmap. This is to
increase reliability and avoid frequent errors when updating this spec file.
---
 archmap           |  9 ++++-----
 fedora-repos.spec | 13 +++++++++----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/archmap b/archmap
index e4793c4..63d86ce 100644
--- a/archmap
+++ b/archmap
@@ -1,8 +1,10 @@
 fedora-7-primary: i386 x86_64 ppc ppc64
 
 fedora-8-primary: i386 x86_64 ppc ppc64
+fedora-8-primary-original:
 
 fedora-9-primary: i386 x86_64 ppc ppc64
+fedora-9-primary-original:
 fedora-9-secondary: ia64
 
 fedora-10-primary: i386 x86_64 ppc ppc64
@@ -19,7 +21,7 @@ fedora-13-secondary: arm mips
 fedora-14-primary: i386 x86_64
 fedora-14-secondary: arm
 
-fedora-15-primary: i386 x86_64 
+fedora-15-primary: i386 x86_64
 fedora-15-secondary: arm armhfp ppc ppc64 s390 s390x
 
 fedora-16-primary: i386 x86_64
@@ -60,6 +62,7 @@ fedora-27-primary: i386 x86_64 armhfp aarch64 ppc64 ppc64le s390x
 fedora-28-primary: i386 x86_64 armhfp aarch64 ppc64 ppc64le s390x
 
 fedora-29-primary: i386 x86_64 armhfp aarch64 ppc64 ppc64le s390x
+fedora-modularity:
 
 fedora-30-primary: i386 x86_64 armhfp aarch64 ppc64le s390x
 
@@ -76,7 +79,3 @@ fedora-34-primary: i386 x86_64 armhfp aarch64 ppc64le s390x
 fedora-35-primary: x86_64 armhfp aarch64 ppc64le s390x
 
 fedora-36-primary: x86_64 armhfp aarch64 ppc64le s390x
-
-fedora-rawhide-primary: x86_64 armhfp aarch64 ppc64le s390x
-
-fedora-eln-primary: i386 x86_64 aarch64 ppc64le s390x
diff --git a/fedora-repos.spec b/fedora-repos.spec
index 12f2597..2a89673 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -3,7 +3,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        35
-Release:        0.10%{?eln:.eln%{eln}}
+Release:        0.11%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -170,9 +170,14 @@ pushd $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
 ln -s RPM-GPG-KEY-fedora-%{rawhide_release}-primary RPM-GPG-KEY-fedora-rawhide-primary
 ln -s RPM-GPG-KEY-fedora-%{rawhide_release}-primary RPM-GPG-KEY-fedora-eln-primary
 for keyfile in RPM-GPG-KEY*; do
-    key=${keyfile#RPM-GPG-KEY-} # e.g. 'fedora-20-primary'
-    arches=$(sed -ne "s/^${key}://p" %{_sourcedir}/archmap) \
-        || echo "WARNING: no archmap entry for $key"
+    # resolve symlinks, so that we don't need to keep duplicate entries in archmap
+    real_keyfile=$(basename $(readlink -f $keyfile))
+    key=${real_keyfile#RPM-GPG-KEY-} # e.g. 'fedora-20-primary'
+    if ! grep -q "^${key}:" %{_sourcedir}/archmap; then
+        echo "ERROR: no archmap entry for $key"
+        exit 1
+    fi
+    arches=$(sed -ne "s/^${key}://p" %{_sourcedir}/archmap)
     for arch in $arches; do
         # replace last part with $arch (fedora-20-primary -> fedora-20-$arch)
         ln -s $keyfile ${keyfile%%-*}-$arch # NOTE: RPM replaces %% with %

From 30b5fc58b1c56ad06f2ed5ead277c4350bd1e231 Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@bhujji.com>
Date: Wed, 17 Feb 2021 16:02:30 -0500
Subject: [PATCH 058/108] Fixing F36 key and updating changelog

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
---
 RPM-GPG-KEY-fedora-36-primary | 52 +++++++++++++++++------------------
 fedora-repos.spec             |  7 ++++-
 2 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/RPM-GPG-KEY-fedora-36-primary b/RPM-GPG-KEY-fedora-36-primary
index 899affa..3b1b19b 100644
--- a/RPM-GPG-KEY-fedora-36-primary
+++ b/RPM-GPG-KEY-fedora-36-primary
@@ -1,29 +1,29 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQINBGAcScoBEADLf8YHkezJ6adlMYw7aGGIlJalt8Jj2x/B2K+hIfIuxGtpVj7e
-LRgDU76jaT5pVD5mFMJ3pkeneR/cTmqqQkNyQshX2oQXwEzUSb1CNMCfCGgkX8Q2
-zZkrIcCrF0Q2wrKblaudhU+iVanADsm18YEqsb5AU37dtUrM3QYdWg9R+XiPfV8R
-KBjT03vVBOdMSsY39LaCn6Ip1Ovp8IEo/IeEVY1qmCOPAaK0bJH3ufg4Cueks+TS
-wQWTeCLxuZL6OMXoOPKwvMQfxbg1XD8vuZ0Ktj/cNH2xau0xmsAu9HJpekvOPRxl
-yqtjyZfroVieFypwZgvQwtnnM8/gSEu/JVTrY052mEUT7Ccb74kcHFTFfMklnkG/
-0fU4ARa504H3xj0ktbe3vKcPXoPOuKBVsHSv00UGYAyPeuy+87cU/YEhM7k3SVKj
-6eIZgyiMO0wl1YGDRKculwks9A+ulkg1oTb4s3zmZvP07GoTxW42jaK5WS+NhZee
-860XoVhbc1KpS+jfZojsrEtZ8PbUZ+YvF8RprdWArjHbJk2JpRKAxThxsQAsBhG1
-0Lux2WaMB0g2I5PcMdJ/cqjo08ccrjBXuixWri5iu9MXp8qT/fSzNmsdIgn8/qZK
-i8Qulfu77uqhW/wt2btnitgRsqjhxMujYU4Zb4hktF8hKU/XX742qhL5KwARAQAB
-tDFGZWRvcmEgKDM1KSA8ZmVkb3JhLTM1LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
-cmc+iQJOBBMBCAA4FiEEeH6mrhFH7uVsQLMM20Y5cZhnxY8FAmAcScoCGw8FCwkI
-BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ20Y5cZhnxY+NYA/7BYpglySAZYHhjyKh
-/+f6zPfVvbH20Eq3kI7OFBN0nLX+BU1muvS+qTuS3WLrB3m3GultpKREJKLtm5ED
-1rGzXAoT1yp9YI8LADdMCCOyjAjsoWU87YUuC+/bnjrTeR2LROCfyPC76W985iOV
-m5S+bsQDw7C2LrldAM4MDuoyZ1SitGaZ4KQLVt+TEa14isYSGCjzo7PY8V3JOk50
-gqWg82N/bm2EzS7T83WEDb1lvj4IlvxgIqKeg11zXYxmrYSZJJCfvzf+lNS6uxgH
-jx/J0ylZ2LibGr6GAAyO9UWrAZSwSM0EcjT8wECnxkSDuyqmWwVvNBXuEIV8Oe3Y
-MiU1fJN8sd7DpsFx5M+XdnMnQS+HrjTPKD3mWrlAdnEThdYV8jZkpWhDys3/99eO
-hk0rLny0jNwkauf/iU8Oc6XvMkjLRMJg5U9VKyJuWWtzwXnjMN5WRFBqK4sZomMM
-ftbTH1+5ybRW/A3vBbaxRW2t7UzNjczekSZEiaLN9L/HcJCIR1QF8682DdAlEF9d
-k2gQiYSQAaaJ0JJAzHvRkRJLLgK2YQYiHNVy2t3JyFfsram5wSCWOfhPeIyLBTZJ
-vrpNlPbefsT957Tf2BNIugzZrC5VxDSKkZgRh1VGvSIQnCyzkQy6EU2qPpiW59G/
-hPIXZrKocK3KLS9/izJQTRltjMA=
-=PfT7
+mQINBGAkKwgBEAC+IQKqp/BI1VIvRRqcnRoAxkzsY3pxIS1L+C4gaWjIMf1eBBTq
+v9eKd4xHsW80VL/tl81WZWO/7JXKmgHODiXrv4HmDIOo6Z1hxehjVRF3Ih4+sKHR
+XCJgwcdJnMfqTKnHiycQggeDuheWbfjV2Fgmvxy0jh0M5PCB5taNz41LmPOaUQmn
+PXcI05CjP5msKjRBObw5Cd2oad60pTNhnBWRf288S8W4wH4jNISOZLZTOf6HU5gJ
+w9wU9RZoaz8kZPNArlJjZsN83S0XLCxpa6UUgYdzPDHOWGtcWGs3bvNAlTYuacun
+oICOvTH/ZJU7mgaZbbdSPVLDJdLBKRVgHbdTAK0J913FEiU93GJR5bf/W5FMN7DV
+6hsJVMiY/knJmkTFE9whDSjEc0TAYhQuC1HnzvMPGJvkeEz9nRqna5QUuo7V6LI4
+fZNTSlqFyIi/Oa3ZoliOyOshxJmU3y1HaNcHerO1nFbTtZ7s/TKBhY9oFq4T4gJV
+yFWy33p/JDxOtlVjpHEkzwXGdPe6R4xK8xHObEVraOMZMaweII+tMOGwVbxZu2kC
+A1aflM+oeyU1Fx9qqM0+dYyHO+kp3M5UtfM006RcNcdfoGrA4l6z9sUnHKsYzOLP
+RvKkzxiX3T91vHtRGCXjPOgOsJJzjkFtE1a5oFZg39fC99HZdbX0rUqAtQARAQAB
+tDFGZWRvcmEgKDM2KSA8ZmVkb3JhLTM2LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
+cmc+iQJOBBMBCAA4FiEEU97Sy5Iti42eY/0YmZ98vzircfQFAmAkKwgCGw8FCwkI
+BwIGFQoJCAsCBBYCAwECHgECF4AACgkQmZ98vzircfSGaxAAlDBWuY1Ch3YsssGE
+uaeOuaHmDj08p08WUAFUPBN0ID+0pmRQjywFzrufw8Z2g/lHwic+tpXXr/RtMmcl
++WzLh1E34TRqEngjDJ27QBq1Jyid3h1manKLhZhJ8b1usKHP7Dqh7n+eMTv2Qgrt
+6MrCNe4otWZ9WJ5vp/Bay5yAtU6lNoWBmJ+6BS1/2mg2jhoXrfg/Vey+/i6nYZIk
+M4IcYCyGCi9rjc8NMgkCyzPkPJtsy2taB+VdUcZyjFpc1acmC8sR/2/SEl4+pOtM
+UzW+OUOQFrerX/8MC5LqvmtsiPMyRDCOw3reJTXyoUIehoHoK9QtAdIRRP2nAkPy
+GKycVzsLbtheJXUZharXL1DwOkpMNlm3hp9BxX89m7dLblMSjtrQPs8CkpAExAQW
+FBltsD73ZhGnfE/XdWp7343m1w5W2m85/rczP+2et+c+HPmYTgaJTu8fAF0FoTDd
+uD1r9DxRa2oN3YBiPP/nXnhJaH//GgF/RRw7Fbc66fCh8DTrMsPgmyi/O3/pdSGe
+k0UqEfSdzNPbl7gVFlCbr4Ur5n1ph+sEZqOhMuyszLZZvYvUrHsDuanML5X25coP
+h+rqyjHJJeYlS2tMAQB1fmHB0LWhRhKYaOROAXFmUutFUxVVoigNCl8mV561DCz6
+6/zy81ZGeyUGOEIZ1NFuoY0EhC8=
+=KaIq
 -----END PGP PUBLIC KEY BLOCK-----
diff --git a/fedora-repos.spec b/fedora-repos.spec
index 2a89673..ad481f0 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -3,7 +3,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        35
-Release:        0.11%{?eln:.eln%{eln}}
+Release:        0.2%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -279,6 +279,11 @@ done
 
 
 %changelog
+* Wed Feb 17 2021 Mohan Boddu <mboddu@bhujji.com> - 35-0.2
+- Support $releasever=rawhide on Rawhide (kparal)
+- Make archmap entries mandatory, except symlinks (kparal)
+- Fixing F36 key
+
 * Tue Feb 09 2021 Tomas Hrcka <thrcka@redhat.com> - 35-0.1
 - Setup for rawhide being F35
 

From 1db958c4fbd16ec2000db953424aa0317e19b125 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20P=C3=A1ral?= <kparal@redhat.com>
Date: Tue, 23 Feb 2021 15:05:55 +0100
Subject: [PATCH 059/108] fully automate repository changes

Instead of performing error-prone manual changes in .repo files several times
per cycle, this patchset brings fully automated handling of such edits. All the
releng person needs to do is to set `rawhide_release` and
`updates_testing_enabled` variables (and of course adjust `Version` and
`Release`), and all the repos will be auto-magically populated with the correct
values during build (which includes `enabled=0/1` and `metadata_expire=6h/7d`).
The intention is to avoid human errors which inevitably happen (an example [1]).

This means:

* Rawhide/ELN repo files will get enabled for Rawhide builds, disabled otherwise.
* Standard repo files will get enabled for non-Rawhide builds, disabled otherwise.
* Updates-testing repo will get enabled per specified configuration (ignored on
  Rawhide).
* Base repo files will have short metadata expiration during development period
  ("Branched"), long expiration during stable period.

Everything is covered with tests, to prevent humans and automatons from doing
mistakes. That covers the automated changes to repo files, but also e.g. ensuring
that updates-testing is not enabled in a Final release by mistake.

Coupled with this changeset is an adjustment to certain repo files to make sure
all the sections defined in a single repo file have the same value
`metadata_expire=`, as it makes sense. And also in the spec file the rawhide
subpackage description was moved next to the subpackage definition, they were
split by mistake in the past, it seems.

If this gets merged, it will massively simplify Releng's Mass Branching SOP in
the future [2].

[1] https://src.fedoraproject.org/rpms/fedora-repos/c/08819dbf9428d57eedbe5cd978b516f995bb8b6a?branch=f34
[2] https://docs.pagure.org/releng/sop_mass_branching.html#fedora-repos
---
 fedora-eln.repo                     |  12 ++-
 fedora-modular.repo                 |   8 +-
 fedora-rawhide-modular.repo         |  13 +--
 fedora-rawhide.repo                 |  13 +--
 fedora-repos.spec                   | 127 ++++++++++++++++++++++++----
 fedora-updates-modular.repo         |   2 +-
 fedora-updates-testing-modular.repo |   2 +-
 fedora-updates-testing.repo         |   2 +-
 fedora-updates.repo                 |   2 +-
 fedora.repo                         |   8 +-
 10 files changed, 143 insertions(+), 46 deletions(-)

diff --git a/fedora-eln.repo b/fedora-eln.repo
index c81fbe4..c6b7f44 100644
--- a/fedora-eln.repo
+++ b/fedora-eln.repo
@@ -11,18 +11,19 @@
 # testing and troubleshooting for development packages in conjunction
 # with new test releases.
 #
-# More information is available at http://fedoraproject.org/wiki/Testing 
+# More information is available at http://fedoraproject.org/wiki/Testing
 #
 # Reproducible and reportable issues should be filed at
 # http://bugzilla.redhat.com/.
 #
 # Product: Fedora
 # Version: eln
+
 [eln-baseos]
 name=Fedora - ELN BaseOS - Developmental packages for the next Enterprise Linux release
 baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/BaseOS/$basearch/os/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
-enabled=1
+enabled=AUTO_VALUE
 countme=1
 metadata_expire=6h
 repo_gpgcheck=0
@@ -36,6 +37,7 @@ name=Fedora - ELN BaseOS - Debug
 baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/BaseOS/$basearch/debug/tree
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
 enabled=0
+metadata_expire=6h
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
@@ -47,6 +49,7 @@ name=Fedora - ELN BaseOS - Source
 baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/BaseOS/source/tree/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
 enabled=0
+metadata_expire=6h
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
@@ -59,7 +62,7 @@ skip_if_unavailable=False
 name=Fedora - ELN AppStream - Developmental packages for the next Enterprise Linux release
 baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/AppStream/$basearch/os/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
-enabled=1
+enabled=AUTO_VALUE
 countme=1
 metadata_expire=6h
 repo_gpgcheck=0
@@ -73,6 +76,7 @@ name=Fedora - ELN AppStream - Debug
 baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/AppStream/$basearch/debug/tree
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
 enabled=0
+metadata_expire=6h
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
@@ -84,9 +88,9 @@ name=Fedora - ELN AppStream - Source
 baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/AppStream/source/tree/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
 enabled=0
+metadata_expire=6h
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 skip_if_unavailable=False
-
diff --git a/fedora-modular.repo b/fedora-modular.repo
index 5aa9c26..f511170 100644
--- a/fedora-modular.repo
+++ b/fedora-modular.repo
@@ -2,9 +2,9 @@
 name=Fedora Modular $releasever - $basearch
 #baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Modular/$basearch/os/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch
-enabled=0
+enabled=AUTO_VALUE
 countme=1
-#metadata_expire=7d
+metadata_expire=AUTO_VALUE
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
@@ -16,7 +16,7 @@ name=Fedora Modular $releasever - $basearch - Debug
 #baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Modular/$basearch/debug/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-debug-$releasever&arch=$basearch
 enabled=0
-metadata_expire=7d
+metadata_expire=AUTO_VALUE
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
@@ -28,7 +28,7 @@ name=Fedora Modular $releasever - Source
 #baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Modular/source/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-source-$releasever&arch=$basearch
 enabled=0
-metadata_expire=7d
+metadata_expire=AUTO_VALUE
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
diff --git a/fedora-rawhide-modular.repo b/fedora-rawhide-modular.repo
index 5646313..24c47a7 100644
--- a/fedora-rawhide-modular.repo
+++ b/fedora-rawhide-modular.repo
@@ -11,7 +11,7 @@
 # testing and troubleshooting for development packages in conjunction
 # with new test releases.
 #
-# More information is available at http://fedoraproject.org/wiki/Testing 
+# More information is available at http://fedoraproject.org/wiki/Testing
 #
 # Reproducible and reportable issues should be filed at
 # http://bugzilla.redhat.com/.
@@ -23,13 +23,13 @@
 name=Fedora - Modular Rawhide - Developmental packages for the next Fedora release
 #baseurl=http://download.example/pub/fedora/linux/development/rawhide/Modular/$basearch/os/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular&arch=$basearch
-enabled=1
+enabled=AUTO_VALUE
 countme=1
 metadata_expire=6h
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch AUTO_VALUE
 skip_if_unavailable=False
 
 [rawhide-modular-debuginfo]
@@ -37,10 +37,11 @@ name=Fedora - Modular Rawhide - Debug
 #baseurl=http://download.example/pub/fedora/linux/development/rawhide/Modular/$basearch/debug/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular-debug&arch=$basearch
 enabled=0
+metadata_expire=6h
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch AUTO_VALUE
 skip_if_unavailable=False
 
 [rawhide-modular-source]
@@ -48,9 +49,9 @@ name=Fedora - Modular Rawhide - Source
 #baseurl=http://download.example/pub/fedora/linux/development/rawhide/Modular/source/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular-source&arch=$basearch
 enabled=0
+metadata_expire=6h
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch AUTO_VALUE
 skip_if_unavailable=False
-
diff --git a/fedora-rawhide.repo b/fedora-rawhide.repo
index 2e649e6..5391fb0 100644
--- a/fedora-rawhide.repo
+++ b/fedora-rawhide.repo
@@ -11,7 +11,7 @@
 # testing and troubleshooting for development packages in conjunction
 # with new test releases.
 #
-# More information is available at http://fedoraproject.org/wiki/Testing 
+# More information is available at http://fedoraproject.org/wiki/Testing
 #
 # Reproducible and reportable issues should be filed at
 # http://bugzilla.redhat.com/.
@@ -23,13 +23,13 @@
 name=Fedora - Rawhide - Developmental packages for the next Fedora release
 #baseurl=http://download.example/pub/fedora/linux/development/rawhide//Everything/$basearch/os/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
-enabled=1
+enabled=AUTO_VALUE
 countme=1
 metadata_expire=6h
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch AUTO_VALUE
 skip_if_unavailable=False
 
 [rawhide-debuginfo]
@@ -37,10 +37,11 @@ name=Fedora - Rawhide - Debug
 #baseurl=http://download.example/pub/fedora/linux/development/rawhide/Everything/$basearch/debug/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-debug&arch=$basearch
 enabled=0
+metadata_expire=6h
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch AUTO_VALUE
 skip_if_unavailable=False
 
 [rawhide-source]
@@ -48,9 +49,9 @@ name=Fedora - Rawhide - Source
 #baseurl=http://download.example/pub/fedora/linux/development/rawhide/Everything/source/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-source&arch=$basearch
 enabled=0
+metadata_expire=6h
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch AUTO_VALUE
 skip_if_unavailable=False
-
diff --git a/fedora-repos.spec b/fedora-repos.spec
index ad481f0..61b874b 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,4 +1,5 @@
 %global rawhide_release 35
+%global updates_testing_enabled 0
 
 Summary:        Fedora package repositories
 Name:           fedora-repos
@@ -106,6 +107,9 @@ Summary:        Rawhide repo definitions
 Requires:       fedora-repos = %{version}-%{release}
 Obsoletes:      fedora-repos-rawhide < 33-0.7
 
+%description rawhide
+This package provides the rawhide repo definitions.
+
 %package archive
 Summary:        Fedora updates archive package repository
 Requires:       fedora-repos = %{version}-%{release}
@@ -115,9 +119,6 @@ This package provides the repo definition for the updates archive repo.
 It is a package repository that contains any RPM that has made it to
 stable in Bodhi and been available in the Fedora updates repo in the past.
 
-%description rawhide
-This package provides the rawhide repo definitions.
-
 %package rawhide-modular
 Summary:        Rawhide modular repo definitions
 Requires:       fedora-repos = %{version}-%{release}
@@ -187,20 +188,51 @@ done
 ln -s RPM-GPG-KEY-fedora-%{version}-primary RPM-GPG-KEY-%{version}-fedora
 popd
 
+# Install repo files
+install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
+for file in %{_sourcedir}/fedora*repo ; do
+  install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d
+done
+
+# Enable or disable repos based on current release cycle state.
+%if %{rawhide_release} == %{version}
+rawhide_enabled=1
+stable_enabled=0
+testing_enabled=0
+%else
+rawhide_enabled=0
+stable_enabled=1
+testing_enabled=%{updates_testing_enabled}
+%endif
+for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-{rawhide,eln}*.repo; do
+    sed -i "s/^enabled=AUTO_VALUE$/enabled=${rawhide_enabled}/" $repo || exit 1
+done
+for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora{,-modular,-updates,-updates-modular}.repo; do
+    sed -i "s/^enabled=AUTO_VALUE$/enabled=${stable_enabled}/" $repo || exit 1
+done
+for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-updates-testing{,-modular}.repo; do
+    sed -i "s/^enabled=AUTO_VALUE$/enabled=${testing_enabled}/" $repo || exit 1
+done
+
 # Adjust Rawhide repo files to include Rawhide+1 GPG key.
 # This is necessary for the period when Rawhide gets bumped to N+1 and packages
 # start to be signed with a newer key. Without having the key specified in the
 # repo file, the system would consider the new packages as untrusted.
 rawhide_next=$((%{rawhide_release}+1))
-for repo in %{_sourcedir}/fedora-rawhide*.repo; do
-    sed -ir "s@^gpgkey=.*@& file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-${rawhide_next}-\$basearch@" \
+for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-rawhide*.repo; do
+    sed -i "/^gpgkey=/ s@AUTO_VALUE@file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-${rawhide_next}-\$basearch@" \
         $repo || exit 1
 done
 
-# Install repo files
-install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
-for file in %{_sourcedir}/fedora*repo ; do
-  install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d
+# Set appropriate metadata_expire in base repo files (6h before Final, 7d after)
+%if "%{release}" < "1"
+expire_value='6h'
+%else
+expire_value='7d'
+%endif
+for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora{,-modular}.repo; do
+    sed -i "/^metadata_expire=/ s/AUTO_VALUE/${expire_value}/" \
+        $repo || exit 1
 done
 
 # Install ostree remote config
@@ -210,23 +242,82 @@ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remo
 
 
 %check
-# assert all rawhide/eln repos are set to enabled only when this is rawhide
-for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-{rawhide,eln}*.repo; do
-  %if %{rawhide_release} == %{version}
-    grep 'enabled=1' $repo
-  %else
-    grep 'enabled=1' $repo && exit 1 || :
-  %endif
+# Make sure all repo variables were substituted
+for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/*.repo; do
+    if grep -q AUTO_VALUE $repo; then
+        echo "ERROR: Repo $repo contains an unsubstituted placeholder value"
+        exit 1
+    fi
 done
 
-# make sure the Rawhide+1 key wasn't forgotten to be created
+# Make sure correct repos were enabled/disabled
+enabled_repos=(fedora-cisco-openh264)
+disabled_repos=(fedora-updates-archive)
+%if %{rawhide_release} == %{version}
+enabled_repos+=(fedora-rawhide fedora-rawhide-modular fedora-eln)
+disabled_repos+=(fedora fedora-modular fedora-updates fedora-updates-modular \
+  fedora-updates-testing fedora-updates-testing-modular)
+%else
+enabled_repos+=(fedora fedora-modular fedora-updates fedora-updates-modular)
+disabled_repos+=(fedora-rawhide fedora-rawhide-modular fedora-eln)
+%if %{updates_testing_enabled}
+enabled_repos+=(fedora-updates-testing fedora-updates-testing-modular)
+%else
+disabled_repos+=(fedora-updates-testing fedora-updates-testing-modular)
+%endif
+%endif
+
+for repo in ${enabled_repos[@]}; do
+    if ! grep -q 'enabled=1' $RPM_BUILD_ROOT/etc/yum.repos.d/${repo}.repo; then
+        echo "ERROR: Repo $repo should have been enabled, but it isn't"
+        exit 1
+    fi
+done
+
+for repo in ${disabled_repos[@]}; do
+    if grep -q 'enabled=1' $RPM_BUILD_ROOT/etc/yum.repos.d/${repo}.repo; then
+        echo "ERROR: Repo $repo should have been disabled, but it isn't"
+        exit 1
+    fi
+done
+
+# Make sure updates-testing is not enabled in a Final (stable) release
+%if "%{release}" >= "1"
+for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-updates-testing{,-modular}.repo; do
+    if grep -q 'enabled=1' $repo; then
+        echo "ERROR: Repo $repo should be disabled in a stable release, but it isn't"
+        exit 1
+    fi
+done
+%endif
+
+# Make sure metadata_expire was correctly set
+%if "%{release}" < "1"
+expire_value='6h'
+%else
+expire_value='7d'
+%endif
+for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora{,-modular}.repo; do
+    lines=$(grep '^metadata_expire=' $repo | sort | uniq)
+    if [ "$(echo "$lines" | wc -l)" -ne 1 ]; then
+        echo "ERROR: Non-matching metadata_expire lines in $repo: $lines"
+        exit 1
+    fi
+    if test "$lines" != "metadata_expire=${expire_value}"; then
+        echo "ERROR: Wrong metadata_expire value in $repo: $lines"
+        exit 1
+    fi
+done
+
+# Make sure the Rawhide+1 key wasn't forgotten to be created
 rawhide_next=$((%{rawhide_release}+1))
+test -n "$rawhide_next" || exit 1
 if ! test -f $RPM_BUILD_ROOT/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-${rawhide_next}-primary; then
     echo "ERROR: GPG key for Fedora ${rawhide_next} is not present"
     exit 1
 fi
 
-# make sure the Rawhide+1 key is present in Rawhide repo files
+# Make sure the Rawhide+1 key is present in Rawhide repo files
 for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-rawhide*.repo; do
     gpg_lines=$(grep '^gpgkey=' $repo)
     if test -z "$gpg_lines"; then
diff --git a/fedora-updates-modular.repo b/fedora-updates-modular.repo
index 37e4b71..f5350a0 100644
--- a/fedora-updates-modular.repo
+++ b/fedora-updates-modular.repo
@@ -2,7 +2,7 @@
 name=Fedora Modular $releasever - $basearch - Updates
 #baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/$basearch/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-f$releasever&arch=$basearch
-enabled=0
+enabled=AUTO_VALUE
 countme=1
 repo_gpgcheck=0
 type=rpm
diff --git a/fedora-updates-testing-modular.repo b/fedora-updates-testing-modular.repo
index 5cd78af..3b9bfca 100644
--- a/fedora-updates-testing-modular.repo
+++ b/fedora-updates-testing-modular.repo
@@ -2,7 +2,7 @@
 name=Fedora Modular $releasever - $basearch - Test Updates
 #baseurl=http://download.example/pub/fedora/linux/updates/testing/$releasever/Modular/$basearch/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-f$releasever&arch=$basearch
-enabled=0
+enabled=AUTO_VALUE
 countme=1
 repo_gpgcheck=0
 type=rpm
diff --git a/fedora-updates-testing.repo b/fedora-updates-testing.repo
index 9306abb..91dc671 100644
--- a/fedora-updates-testing.repo
+++ b/fedora-updates-testing.repo
@@ -2,7 +2,7 @@
 name=Fedora $releasever - $basearch - Test Updates
 #baseurl=http://download.example/pub/fedora/linux/updates/testing/$releasever/Everything/$basearch/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
-enabled=0
+enabled=AUTO_VALUE
 countme=1
 repo_gpgcheck=0
 type=rpm
diff --git a/fedora-updates.repo b/fedora-updates.repo
index 9992c83..80ccb4d 100644
--- a/fedora-updates.repo
+++ b/fedora-updates.repo
@@ -2,7 +2,7 @@
 name=Fedora $releasever - $basearch - Updates
 #baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/$basearch/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
-enabled=0
+enabled=AUTO_VALUE
 countme=1
 repo_gpgcheck=0
 type=rpm
diff --git a/fedora.repo b/fedora.repo
index b39369e..66d4de7 100644
--- a/fedora.repo
+++ b/fedora.repo
@@ -2,9 +2,9 @@
 name=Fedora $releasever - $basearch
 #baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
-enabled=0
+enabled=AUTO_VALUE
 countme=1
-#metadata_expire=7d
+metadata_expire=AUTO_VALUE
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
@@ -16,7 +16,7 @@ name=Fedora $releasever - $basearch - Debug
 #baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch
 enabled=0
-metadata_expire=7d
+metadata_expire=AUTO_VALUE
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
@@ -28,7 +28,7 @@ name=Fedora $releasever - Source
 #baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/source/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch
 enabled=0
-metadata_expire=7d
+metadata_expire=AUTO_VALUE
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1

From 28e467860599bfcc67b9123f50e1161fa1f324c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Tue, 23 Feb 2021 20:19:49 +0100
Subject: [PATCH 060/108] Use eln and rawhide arch symlinks from repo files

Sometimes installation just selected packages from rawhide is requested.
Prevent signature verification failure when installing rawhide package
on older stable release. Releasever in rawhide repo would link to
stable fedora, but package might be signed by more recent key.
Link always to the latest rawhide key link provided by fedora-gpg-keys.
---
 fedora-eln.repo             | 12 ++++++------
 fedora-rawhide-modular.repo |  6 +++---
 fedora-rawhide.repo         |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/fedora-eln.repo b/fedora-eln.repo
index c6b7f44..7992bf6 100644
--- a/fedora-eln.repo
+++ b/fedora-eln.repo
@@ -29,7 +29,7 @@ metadata_expire=6h
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
 skip_if_unavailable=False
 
 [eln-baseos-debuginfo]
@@ -41,7 +41,7 @@ metadata_expire=6h
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
 skip_if_unavailable=False
 
 [eln-baseos-source]
@@ -53,7 +53,7 @@ metadata_expire=6h
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
 skip_if_unavailable=False
 
 
@@ -68,7 +68,7 @@ metadata_expire=6h
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
 skip_if_unavailable=False
 
 [eln-appstream-debuginfo]
@@ -80,7 +80,7 @@ metadata_expire=6h
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
 skip_if_unavailable=False
 
 [eln-appstream-source]
@@ -92,5 +92,5 @@ metadata_expire=6h
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
 skip_if_unavailable=False
diff --git a/fedora-rawhide-modular.repo b/fedora-rawhide-modular.repo
index 24c47a7..d4ecfa1 100644
--- a/fedora-rawhide-modular.repo
+++ b/fedora-rawhide-modular.repo
@@ -29,7 +29,7 @@ metadata_expire=6h
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch AUTO_VALUE
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-rawhide-$basearch AUTO_VALUE
 skip_if_unavailable=False
 
 [rawhide-modular-debuginfo]
@@ -41,7 +41,7 @@ metadata_expire=6h
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch AUTO_VALUE
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-rawhide-$basearch AUTO_VALUE
 skip_if_unavailable=False
 
 [rawhide-modular-source]
@@ -53,5 +53,5 @@ metadata_expire=6h
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch AUTO_VALUE
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-rawhide-$basearch AUTO_VALUE
 skip_if_unavailable=False
diff --git a/fedora-rawhide.repo b/fedora-rawhide.repo
index 5391fb0..f5172ea 100644
--- a/fedora-rawhide.repo
+++ b/fedora-rawhide.repo
@@ -29,7 +29,7 @@ metadata_expire=6h
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch AUTO_VALUE
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-rawhide-$basearch AUTO_VALUE
 skip_if_unavailable=False
 
 [rawhide-debuginfo]
@@ -41,7 +41,7 @@ metadata_expire=6h
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch AUTO_VALUE
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-rawhide-$basearch AUTO_VALUE
 skip_if_unavailable=False
 
 [rawhide-source]
@@ -53,5 +53,5 @@ metadata_expire=6h
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch AUTO_VALUE
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-rawhide-$basearch AUTO_VALUE
 skip_if_unavailable=False

From e60495fa87a727466e4a02554773d91d3fc4c4f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Tue, 25 Aug 2020 15:48:43 +0200
Subject: [PATCH 061/108] Check importing all arch keys
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Current builder arch might not be in primary architectures.
That would not be a problem, presence of archmap record for every key is
already enforced. Use list of supported arches and just ensure they all
have working GPG keys. Ensure it is not empty by demanding at least one
imported key.

Check imported key separately for each release

Stable branch version and rawhide would be different on stable branch.
Check those releases independent way, each must have own working key.

Signed-off-by: Petr Menšík <pemensik@redhat.com>
---
 fedora-repos.spec | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index 61b874b..dc21393 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -4,7 +4,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        35
-Release:        0.2%{?eln:.eln%{eln}}
+Release:        0.3%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -16,6 +16,8 @@ Requires:       fedora-repos-rawhide = %{version}-%{release}
 %endif
 Requires:       fedora-gpg-keys >= %{version}-%{release}
 BuildArch:      noarch
+# Required by %%check
+BuildRequires:  gnupg sed
 
 Source1:        archmap
 Source2:        fedora.repo
@@ -273,7 +275,6 @@ for repo in ${enabled_repos[@]}; do
         exit 1
     fi
 done
-
 for repo in ${disabled_repos[@]}; do
     if grep -q 'enabled=1' $RPM_BUILD_ROOT/etc/yum.repos.d/${repo}.repo; then
         echo "ERROR: Repo $repo should have been disabled, but it isn't"
@@ -322,6 +323,7 @@ for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-rawhide*.repo; do
     gpg_lines=$(grep '^gpgkey=' $repo)
     if test -z "$gpg_lines"; then
         echo "ERROR: No gpgkey= lines in $repo"
+
         exit 1
     fi
     while IFS= read -r line; do
@@ -332,6 +334,19 @@ for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-rawhide*.repo; do
     done <<< "$gpg_lines"
 done
 
+# Check arch keys exists on supported architectures
+TMPRING=$(mktemp)
+for VER in %{version} %{rawhide_release} ${rawhide_next}; do
+  echo -n > "$TMPRING"
+  for ARCH in $(sed -ne "s/^fedora-${VER}-primary://p" %{_sourcedir}/archmap)
+  do
+    gpg --no-default-keyring --keyring="$TMPRING" \
+      --import $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-fedora-$VER-$ARCH
+  done
+  # Ensure some arch key was imported
+  gpg --no-default-keyring --keyring="$TMPRING" --list-keys | grep -A 2 '^pub\s'
+done
+rm -f "$TMPRING"
 
 %files
 %dir /etc/yum.repos.d
@@ -370,6 +385,9 @@ done
 
 
 %changelog
+* Fri Feb 19 2021 Petr Menšík <pemensik@redhat.com> - 35-0.3
+- Check arch key imports during build (#1872248)
+
 * Wed Feb 17 2021 Mohan Boddu <mboddu@bhujji.com> - 35-0.2
 - Support $releasever=rawhide on Rawhide (kparal)
 - Make archmap entries mandatory, except symlinks (kparal)

From dbade8b30098bc569ef49f792b30db3bf334fee1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Tue, 25 Aug 2020 12:56:40 +0200
Subject: [PATCH 062/108] Create test for rawhide signatures check
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Should prevent usual broken signatures after new version branch.
Tests possible enablement from stable branch and upgrade. It should work
without GPG validation disabled.

Add STI entry for new test

Adds fmf and tmt support.

Remove RHTS dependencies

Workaround on platforms, where $basearch != $(arch)

i686 has a key on i386. Those platforms are not the same.

Use dnf to obtain basearch in test

Keep using just coreutils in spec, dnf build dependency might create
circular dependencies.

Signed-off-by: Petr Menšík <pemensik@redhat.com>
---
 tests/.fmf/version              |  1 +
 tests/rawhide-enable/Makefile   | 61 ++++++++++++++++++++++++++
 tests/rawhide-enable/PURPOSE    |  6 +++
 tests/rawhide-enable/main.fmf   | 20 +++++++++
 tests/rawhide-enable/runtest.sh | 77 +++++++++++++++++++++++++++++++++
 tests/tests.yml                 |  8 ++++
 6 files changed, 173 insertions(+)
 create mode 100644 tests/.fmf/version
 create mode 100644 tests/rawhide-enable/Makefile
 create mode 100644 tests/rawhide-enable/PURPOSE
 create mode 100644 tests/rawhide-enable/main.fmf
 create mode 100755 tests/rawhide-enable/runtest.sh
 create mode 100644 tests/tests.yml

diff --git a/tests/.fmf/version b/tests/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/tests/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/tests/rawhide-enable/Makefile b/tests/rawhide-enable/Makefile
new file mode 100644
index 0000000..3388bfc
--- /dev/null
+++ b/tests/rawhide-enable/Makefile
@@ -0,0 +1,61 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /CoreOS/tests/Regression/rawhide-enable
+#   Description: Tries enabling rawhide and upgrading after it
+#   Author: Petr Mensik <pemensik@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2020 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/CoreOS/tests/Regression/rawhide-enable
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	test -x runtest.sh || chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include $(realpath /usr/share/rhts/lib/rhts-make.include)
+
+$(METADATA): Makefile
+	@echo "Owner:           Petr Mensik <pemensik@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     Tries enabling rawhide and upgrading after it" >> $(METADATA)
+	@echo "Type:            Regression" >> $(METADATA)
+	@echo "TestTime:        5m" >> $(METADATA)
+	@echo "RunFor:          fedora-repos" >> $(METADATA)
+	@echo "Requires:        fedora-gpg-keys fedora-repos dnf-utils sed gnupg dnf" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2+" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     yes" >> $(METADATA)
+	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
diff --git a/tests/rawhide-enable/PURPOSE b/tests/rawhide-enable/PURPOSE
new file mode 100644
index 0000000..5d50d75
--- /dev/null
+++ b/tests/rawhide-enable/PURPOSE
@@ -0,0 +1,6 @@
+PURPOSE of /CoreOS/tests/Regression/rawhide-enable
+Description: Tries enabling rawhide and upgrading after it
+Author: Petr Mensik <pemensik@redhat.com>
+
+Check enabling of Rawhide from stable release.
+Ensure packages can be updated to Rawhide from a stable release.
diff --git a/tests/rawhide-enable/main.fmf b/tests/rawhide-enable/main.fmf
new file mode 100644
index 0000000..423a505
--- /dev/null
+++ b/tests/rawhide-enable/main.fmf
@@ -0,0 +1,20 @@
+summary: Tries enabling rawhide and upgrading after it
+description: |
+    Check enabling of Rawhide from stable release.
+    Ensure packages can be updated to Rawhide from a stable release.
+contact:
+- Petr Mensik <pemensik@redhat.com>
+component:
+- fedora-repos
+test: ./runtest.sh
+framework: beakerlib
+recommend:
+- fedora-gpg-keys
+- fedora-repos
+- dnf-utils
+- sed
+- gnupg
+- dnf
+duration: 5m
+extra-summary: /CoreOS/tests/Regression/rawhide-enable
+extra-task: /CoreOS/tests/Regression/rawhide-enable
diff --git a/tests/rawhide-enable/runtest.sh b/tests/rawhide-enable/runtest.sh
new file mode 100755
index 0000000..cee5490
--- /dev/null
+++ b/tests/rawhide-enable/runtest.sh
@@ -0,0 +1,77 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /CoreOS/tests/Regression/rawhide-enable
+#   Description: Tries enabling rawhide and upgrading after it
+#   Author: Petr Mensik <pemensik@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2020 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include Beaker environment
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+PACKAGE="fedora-repos"
+
+basearch() {
+	dnf config-manager --dump-variables | sed -e '/^basearch\s*=/ ! d' -e 's/^[^=]*=\s*//'
+}
+
+test_keyring() {
+	rlRun "KEYRING=$(mktemp --tmpdir keyring.XXXXXXX)"
+	rlRun "BASEARCH=$(basearch)"
+	rlRun "gpg --no-default-keyring --keyring $KEYRING --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$RAWHIDE_RELEASE-$BASEARCH" 0 "Test import of rawhide key"
+	rlRun "rm -f $KEYRING"
+}
+
+rlJournalStart
+  if rpm -q $PACKAGE-rawhide; then
+    rlPhaseStartTest
+	rlLogWarning "This test should test stable releases, not rawhide!"
+	# Just check GPG key can be imported on this arch
+	rlRun "RAWHIDE_RELEASE=$(rpm -q fedora-repos-rawhide | cut -d- -f4)"
+	test_keyring
+    rlPhaseEnd
+  else
+    rlPhaseStartSetup
+        rlAssertRpm $PACKAGE
+	rlAssertNotRpm $PACKAGE-rawhide # rawhide should not yet be installed at this point
+	rlRun "dnf -y upgrade fedora-repos fedora-gpg-keys"
+	rlRun "dnf -y install fedora-repos-rawhide"
+	rlRun "dnf config-manager --set-enabled rawhide"
+	rlRun "RAWHIDE_RELEASE=$(dnf --repo rawhide repoquery fedora-repos | sed -e 's/fedora-repos-\(0:\)\?\([0-9]\+\)-.*/\2/')" 0 "Find rawhide version"
+    rlPhaseEnd
+
+    rlPhaseStartTest
+	# Until proposal https://pagure.io/releng/issue/7445 is solved, this might fail
+	rlRun "dnf -y upgrade fedora-gpg-keys" 0,1 "Try normal upgrade"
+	# Ensure it works with manual release increment
+	rlRun "dnf -y --repo rawhide --releasever $RAWHIDE_RELEASE upgrade fedora-gpg-keys" 0 "Upgrade with bumped release"
+	test_keyring
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+	rlRun "dnf config-manager --set-disabled rawhide"
+	rlRun "dnf -y downgrade fedora-gpg-keys fedora-repos-rawhide" 0 "Cleanup dnf changes back"
+	rlRun "dnf -y remove --noautoremove fedora-repos-rawhide"
+    rlPhaseEnd
+  fi
+rlJournalPrintText
+rlJournalEnd
diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100644
index 0000000..420fb8d
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,8 @@
+---
+# This first play always runs on the local staging system
+- hosts: localhost
+  roles:
+  - role: standard-test-beakerlib
+    tags:
+    - classic
+    fmf_filter: "tier: 1"

From e245df682c5e2526284434354a612838bbc7d52b Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Tue, 27 Apr 2021 17:16:00 -0400
Subject: [PATCH 063/108] Enable the updates archive repo on non-rawhide.

The fedora-repos-archive RPM is only installed by default in places
where it is needed (i.e. OSTree based distributions). The yum repo
file delivered by the RPM should default to being enabled when on
a numbered version of Fedora (non-rawhide). This was the original
intention when I added it a while back.
---
 fedora-repos.spec           | 19 ++++++++++++++-----
 fedora-updates-archive.repo |  2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index dc21393..7f70dd1 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -4,7 +4,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        35
-Release:        0.3%{?eln:.eln%{eln}}
+Release:        0.4%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -201,10 +201,12 @@ done
 rawhide_enabled=1
 stable_enabled=0
 testing_enabled=0
+archive_enabled=0
 %else
 rawhide_enabled=0
 stable_enabled=1
 testing_enabled=%{updates_testing_enabled}
+archive_enabled=1
 %endif
 for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-{rawhide,eln}*.repo; do
     sed -i "s/^enabled=AUTO_VALUE$/enabled=${rawhide_enabled}/" $repo || exit 1
@@ -215,6 +217,9 @@ done
 for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-updates-testing{,-modular}.repo; do
     sed -i "s/^enabled=AUTO_VALUE$/enabled=${testing_enabled}/" $repo || exit 1
 done
+for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-updates-archive.repo; do
+    sed -i "s/^enabled=AUTO_VALUE$/enabled=${archive_enabled}/" $repo || exit 1
+done
 
 # Adjust Rawhide repo files to include Rawhide+1 GPG key.
 # This is necessary for the period when Rawhide gets bumped to N+1 and packages
@@ -254,13 +259,14 @@ done
 
 # Make sure correct repos were enabled/disabled
 enabled_repos=(fedora-cisco-openh264)
-disabled_repos=(fedora-updates-archive)
+disabled_repos=()
 %if %{rawhide_release} == %{version}
 enabled_repos+=(fedora-rawhide fedora-rawhide-modular fedora-eln)
-disabled_repos+=(fedora fedora-modular fedora-updates fedora-updates-modular \
-  fedora-updates-testing fedora-updates-testing-modular)
+disabled_repos+=(fedora fedora-modular fedora-updates fedora-updates-archive \
+  fedora-updates-modular fedora-updates-testing fedora-updates-testing-modular)
 %else
-enabled_repos+=(fedora fedora-modular fedora-updates fedora-updates-modular)
+enabled_repos+=(fedora fedora-modular fedora-updates fedora-updates-archive \
+  fedora-updates-modular)
 disabled_repos+=(fedora-rawhide fedora-rawhide-modular fedora-eln)
 %if %{updates_testing_enabled}
 enabled_repos+=(fedora-updates-testing fedora-updates-testing-modular)
@@ -385,6 +391,9 @@ rm -f "$TMPRING"
 
 
 %changelog
+* Wed Apr 28 2021 Dusty Mabe <dusty@dustymabe.com> - 35-0.4
+- Enable the updates archive repo on non-rawhide.
+
 * Fri Feb 19 2021 Petr Menšík <pemensik@redhat.com> - 35-0.3
 - Check arch key imports during build (#1872248)
 
diff --git a/fedora-updates-archive.repo b/fedora-updates-archive.repo
index 4cc3551..1125c52 100644
--- a/fedora-updates-archive.repo
+++ b/fedora-updates-archive.repo
@@ -12,7 +12,7 @@
 [updates-archive]
 name=Fedora $releasever - $basearch - Updates Archive
 baseurl=https://fedoraproject-updates-archive.fedoraproject.org/fedora/$releasever/$basearch/
-enabled=0
+enabled=AUTO_VALUE
 metadata_expire=6h
 repo_gpgcheck=0
 type=rpm

From dec4ecc8dc108cccb625a9fd0e18c4d6ab686249 Mon Sep 17 00:00:00 2001
From: Tomas Hrcka <thrcka@redhat.com>
Date: Tue, 10 Aug 2021 17:44:53 +0200
Subject: [PATCH 064/108] Setup for rawhide being F36

Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
---
 archmap           | 2 ++
 fedora-repos.spec | 9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/archmap b/archmap
index 63d86ce..bb70c63 100644
--- a/archmap
+++ b/archmap
@@ -79,3 +79,5 @@ fedora-34-primary: i386 x86_64 armhfp aarch64 ppc64le s390x
 fedora-35-primary: x86_64 armhfp aarch64 ppc64le s390x
 
 fedora-36-primary: x86_64 armhfp aarch64 ppc64le s390x
+
+fedora-37-primary: x86_64 armhfp aarch64 ppc64le s390x
diff --git a/fedora-repos.spec b/fedora-repos.spec
index 7f70dd1..b4c3804 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,10 +1,10 @@
-%global rawhide_release 35
+%global rawhide_release 36
 %global updates_testing_enabled 0
 
 Summary:        Fedora package repositories
 Name:           fedora-repos
-Version:        35
-Release:        0.4%{?eln:.eln%{eln}}
+Version:        36
+Release:        0.1%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -391,6 +391,9 @@ rm -f "$TMPRING"
 
 
 %changelog
+* Tue Aug 10 2021 Tomas Hrcka <thrcka@redhat.com> - 36-0.1
+- Setup for rawhide being F36
+
 * Wed Apr 28 2021 Dusty Mabe <dusty@dustymabe.com> - 35-0.4
 - Enable the updates archive repo on non-rawhide.
 

From 688de4b2d4bf3411433d7e0978030b3a2cb37795 Mon Sep 17 00:00:00 2001
From: Tomas Hrcka <thrcka@redhat.com>
Date: Tue, 10 Aug 2021 19:56:19 +0200
Subject: [PATCH 065/108] Add F37 gpg key

Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
---
 RPM-GPG-KEY-fedora-37-primary | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 RPM-GPG-KEY-fedora-37-primary

diff --git a/RPM-GPG-KEY-fedora-37-primary b/RPM-GPG-KEY-fedora-37-primary
new file mode 100644
index 0000000..71fc128
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-37-primary
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+ 
+mQINBGESvNwBEAC7HsCDTlugVeDSMFX6aW3zAPFMfvBssNj+89fdmbxcI9t7UY6f
+HvkkGziUET8e+9jB8R2/wXQCGOw1J+sfmwO4aN0LdVQjhKvVNj+F5jWt3m5FAIBa
+OTWS6Kvqw2ECTpH7fD86541eK3BuCni6d5U3PCd73t976FcUmpQ/1AthqMksM0Jz
+cJapvNmLTCR0NZ2XyyLmn/K1hgNXe8G5j0cSrJiY+Zpz5aQkT96j96Jm6W2A+tBI
+icU4n6V4vlj2TxmCumtXJGXGBGJnof/dCgh45aqi+sk5c429ns+5sooYcaEJojj6
+FYSITv10l+az6ZMJz/j61VYSkhMY8hQ4Wd+yL2JVzLE9N9V0L95sX1yEZ5ILmzwx
+oRKe4WHSBE6yMxNWobv7hmC+3ZC5mLPaEDS/g/0xuQj9Sy9eT2mhhFPxOv29YQ+P
+sC3zXHJMMT0tlGd72PVHQQ0JYONfMhcC+7AHGFGz8p4/wor2jIFG1ouqE6Lfzm8o
+XWZMYm3AydlrP/xkYaoWNE3jL/+dskSBr/Yz7ZzlkAqH9lb1HKnXQLTrw6gz6pmI
+KufSDXjEFNxnFI/9gMlshJtk5+QSDzezmxFm+NMviSvDUNAVIzrU1D84dauBYph4
+OrJVeECQHEotny/I53AdlVwLYB4TWkObzTs6vtV7Pz1TK2CmHpe3UW72xwARAQAB
+tDFGZWRvcmEgKDM3KSA8ZmVkb3JhLTM3LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
+cmc+iQJOBBMBCAA4FiEErLXuToMcdLt8Fo0n9VrT+1MjVSoFAmESvNwCGw8FCwkI
+BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ9VrT+1MjVSoPMhAAist7kK/YtcyBL/dt
+P55hPrkJT6Ay+e2Dvt4Pixe4iT32Y3jG12aoX2LY//mxVOOpV+EhXYTTb5aLt2Jj
+a8/qCKJFk7zuCOxa1hgdRcjoR7ZbU0lNjD9mMCax/YT9QafcaMEib/FlknP3g1SN
+GRSKLObTJd6BbtZXCE80JRIX+Dy6+/Oz7LXRXeKpiimhlXT1wuTaqAJEtuHdQvg7
+dkL4DzAJ2FiURVd5gvgo266WaCMafJjFRrSGHJm0c+V+0Z9NsuH80JbPm+rCUh5U
+E9PMyztqlqtldtqc1+aZ1iUbVuXY059BUmlAhmf5sAlBktY+hEabH/4kmfGccbBL
+TyBIn03Y9q9173okZSUe6q16m/hbbWI8dwkSpIADZbGGJbRi8PJpCg9y6KI355qD
+atE2irleoy6eXqpKa+uPTRBk7i/r6jDoA+u+tZyFfcEnwvSWP8cN1j5mNklvITZl
+YF1n5b3fejkZVdOmRZQNkyzMxYEd4UZFQZNYrx0nltAagRS8b5ikqNk2UTl+dyBG
+k9gLOSZhAa2JdmAqwe9rT69jaa4kZMLlxPPC3246s83t0s7lp7vF+zLPfPSvxpsU
+tg+fuT+OFKWYdBFF7VkEA+wezHAznIP6TPyQXbBpkzE889/hOXy4BYs0wy8Bpda/
+Ve2Ba329f99dSCZKImi5DPCxJY4=
+=ZmVd
+-----END PGP PUBLIC KEY BLOCK-----
\ No newline at end of file

From 996a40d913af92378c30d481d4384f2dbab306b1 Mon Sep 17 00:00:00 2001
From: Tomas Hrcka <thrcka@redhat.com>
Date: Tue, 10 Aug 2021 19:59:57 +0200
Subject: [PATCH 066/108] Add new key to the specfile

Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
---
 fedora-repos.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index b4c3804..4911a9d 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -76,6 +76,7 @@ Source53:       RPM-GPG-KEY-fedora-33-primary
 Source54:       RPM-GPG-KEY-fedora-34-primary
 Source55:       RPM-GPG-KEY-fedora-35-primary
 Source56:       RPM-GPG-KEY-fedora-36-primary
+Source57:       RPM-GPG-KEY-fedora-37-primary
 # When bumping Rawhide to fN, create N+1 key (and update archmap). (This
 # ensures users have the next future key installed and referenced, even if they
 # don't update very often. This will smooth out Rawhide N->N+1 transition for them).

From dcde923f290ee188a2e8e0ba5942e60c7f6cd40d Mon Sep 17 00:00:00 2001
From: Tomas Hrcka <thrcka@redhat.com>
Date: Tue, 10 Aug 2021 20:43:00 +0200
Subject: [PATCH 067/108] Bump release

Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
---
 fedora-repos.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index 4911a9d..3fbf14a 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -4,7 +4,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        36
-Release:        0.1%{?eln:.eln%{eln}}
+Release:        0.2%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -392,7 +392,7 @@ rm -f "$TMPRING"
 
 
 %changelog
-* Tue Aug 10 2021 Tomas Hrcka <thrcka@redhat.com> - 36-0.1
+* Tue Aug 10 2021 Tomas Hrcka <thrcka@redhat.com> - 36-0.2
 - Setup for rawhide being F36
 
 * Wed Apr 28 2021 Dusty Mabe <dusty@dustymabe.com> - 35-0.4

From d501e7f0a46db16be88a46d0bba981d7f4684c09 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 16 Aug 2021 16:58:41 -0400
Subject: [PATCH 068/108] Remove spurious space ` ` in
 RPM-GPG-KEY-fedora-37-primary

gpg accepts this, whereas librpm's bespoke PGP code does not.
I didn't look at the specification but I doubt it allows extra
whitespace.

dnf uses the gpg APIs to import and canonicalize keys before passing
them to librpm.  gpg happily accepts the extra whitespace.

librpm has a bespoke PGP parser which rejects this.

Fixes https://github.com/rpm-software-management/libdnf/issues/1320
---
 RPM-GPG-KEY-fedora-37-primary | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RPM-GPG-KEY-fedora-37-primary b/RPM-GPG-KEY-fedora-37-primary
index 71fc128..8ed5fff 100644
--- a/RPM-GPG-KEY-fedora-37-primary
+++ b/RPM-GPG-KEY-fedora-37-primary
@@ -1,5 +1,5 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
- 
+
 mQINBGESvNwBEAC7HsCDTlugVeDSMFX6aW3zAPFMfvBssNj+89fdmbxcI9t7UY6f
 HvkkGziUET8e+9jB8R2/wXQCGOw1J+sfmwO4aN0LdVQjhKvVNj+F5jWt3m5FAIBa
 OTWS6Kvqw2ECTpH7fD86541eK3BuCni6d5U3PCd73t976FcUmpQ/1AthqMksM0Jz

From f0245a34a7d3c13c15ecea682a406f3bc65e8863 Mon Sep 17 00:00:00 2001
From: Tomas Hrcka <thrcka@redhat.com>
Date: Tue, 17 Aug 2021 18:07:44 +0200
Subject: [PATCH 069/108] Bump release for
 https://src.fedoraproject.org/rpms/fedora-repos/pull-request/112

Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
---
 fedora-repos.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index 3fbf14a..9a4d2ae 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -4,7 +4,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        36
-Release:        0.2%{?eln:.eln%{eln}}
+Release:        0.3%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -392,7 +392,7 @@ rm -f "$TMPRING"
 
 
 %changelog
-* Tue Aug 10 2021 Tomas Hrcka <thrcka@redhat.com> - 36-0.2
+* Tue Aug 10 2021 Tomas Hrcka <thrcka@redhat.com> - 36-0.3
 - Setup for rawhide being F36
 
 * Wed Apr 28 2021 Dusty Mabe <dusty@dustymabe.com> - 35-0.4

From 006247fe5a627b5a3b40c6c03636f1047f282fe1 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Tue, 17 Aug 2021 16:28:59 -0700
Subject: [PATCH 070/108] Correct changelog

---
 fedora-repos.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index 9a4d2ae..a15e729 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -392,7 +392,10 @@ rm -f "$TMPRING"
 
 
 %changelog
-* Tue Aug 10 2021 Tomas Hrcka <thrcka@redhat.com> - 36-0.3
+* Tue Aug 17 2021 Tomas Hrcka <thrcka@redhat.com> - 36-0.3
+- Remove spurious space in RPM-GPG-KEY-fedora-37-primary (cgwalters)
+
+* Tue Aug 10 2021 Tomas Hrcka <thrcka@redhat.com> - 36-0.2
 - Setup for rawhide being F36
 
 * Wed Apr 28 2021 Dusty Mabe <dusty@dustymabe.com> - 35-0.4

From c0a5a042fea9ec86f473ce57efb788f2bdc22c95 Mon Sep 17 00:00:00 2001
From: Tomas Hrcka <thrcka@redhat.com>
Date: Tue, 8 Feb 2022 19:20:57 +0100
Subject: [PATCH 071/108] Setup for rawhide being F37

Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
---
 fedora-repos.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index a15e729..dd28bbd 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,10 +1,10 @@
-%global rawhide_release 36
+%global rawhide_release 37
 %global updates_testing_enabled 0
 
 Summary:        Fedora package repositories
 Name:           fedora-repos
-Version:        36
-Release:        0.3%{?eln:.eln%{eln}}
+Version:        37
+Release:        0.1%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -392,6 +392,9 @@ rm -f "$TMPRING"
 
 
 %changelog
+* Tue Feb 08 2022 Tomas Hrcka <thrcka@redhat.com> - 37-0.1
+- Setup for rawhide being F37
+
 * Tue Aug 17 2021 Tomas Hrcka <thrcka@redhat.com> - 36-0.3
 - Remove spurious space in RPM-GPG-KEY-fedora-37-primary (cgwalters)
 

From ef1ca697853912a73e5af9a05084792c101f53e8 Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@bhujji.com>
Date: Tue, 8 Feb 2022 16:09:51 -0500
Subject: [PATCH 072/108] Setup for rawhide being F37

Adding F38 key

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
---
 RPM-GPG-KEY-fedora-38-primary | 29 +++++++++++++++++++++++++++++
 fedora-repos.spec             |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 RPM-GPG-KEY-fedora-38-primary

diff --git a/RPM-GPG-KEY-fedora-38-primary b/RPM-GPG-KEY-fedora-38-primary
new file mode 100644
index 0000000..ac2db41
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-38-primary
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGIC2cYBEADJye1aE0AR17qwj6wsHWlCQlcihmqkL8s4gbOk1IevBbH4iXJx
+lu6bN+NhTcCCX6eHmaL5Pwb/bpkMmLR+/r1D2cLDK24YzvN6kJnwRQUTf2dbqYmg
+mNBgIMm+kAabBZPwUHUzyQ9CT/WJpYr1OYu8JIkdxF35nrPewnnOUUqxqbi8fXRQ
+gskSLF8UveiOjFIqmWwlPwT1UtnevAaF80UGQlkwFvqjjh4b9vKY2gHMAQwt+wg5
+HFFCSwSrnd88ZoDb3pKvDMeurYUiPzF5f2r+ziVkMuaSNckvp58uge7HvyqQPAdJ
+ZRswCCxhUAo9VqkNfB4Ud25ASyalk9jOE3HB8E35gFfPXvuX1n15THXNcwMEiybk
+Omne2YwXL8ShGNr5otjqywThMrrqcl2g/pJVTcpDHTR5Hn9YRp+GHlYLjyEr+/x7
+xM19y9ca9GUiJqDbEREHcKKIhYiGmcIjjcJvei/3C/aM4pqeGFJBbVSnw3qeMxH/
+6ArAMA1sAdShCkv2YjlcF0r4uoCjXdS3xrKLz9PSCquot7RySnOE9TZ7flfJll7Z
+q+lNaSeJg7FK8VWSUb9Lit6VEYVbzWKzespDDbujrHbFpydyq8gXurk7bSR2w0te
+gsmytQqT/w1z2bydgGF6SfY9Px0wuA8GQKr48l5Bhdc6+vHHFqPKzz0PVQARAQAB
+tDFGZWRvcmEgKDM4KSA8ZmVkb3JhLTM4LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
+cmc+iQJOBBMBCAA4FiEEalG7q7o9VGe2FxIhgJqNfOsQtGQFAmIC2cYCGw8FCwkI
+BwIGFQoJCAsCBBYCAwECHgECF4AACgkQgJqNfOsQtGScyw/7BLmD4Fwi4QZY94zl
+vlJdNufZRavOemSIVVDHoCr8pQBAdrvoMypxJd5zM4ODIqFsjdYpFti+Tkeq4/4U
+25UoLPEOtU8UDt2uq7LqfdCxspaj7VyXAJIkpf7wEvLS4Jzo+YaMIlsd0dCrMXTM
+vhu4gKpBFW6C+gGlmuDyTJbyrf7ilytgVzVtIfRrT7XffylviIlZHwKm43UDjvzX
+YEl3EAFR1RjATwXMy2aJh7GCNsz+fKs+7YRKQUhpMF5un/2pyNJO+LbVGGwGZvga
+K9Kfsg/4r1ync4nDDD1dadKIHhobDeiJ9uZLoBvvVDz7Ywu7q/vv4zIPxstYBNq4
+6fLKDtYXuJCK0EV9Qy4ox67t0UGlaRGH8y5YUqOI10xH7iQej0xWlSc8w2dKhPz8
+z9XLv2OMK+PvqvflhFHhWkqEoQRqTu0TVD0fLLe4lqieJlqZcJqW0F9G/vNSSWmf
+POLa/Nim71gL2fPjCJOIRV4K/cJSyBmu5NchG7dHD5sUtJxZ4TFSuepaBZ8cPK1x
+e26TaCBqoUWgUXWmw+P89aOpYOJYEFfT/VAm2Ywn+c1EFUmD+30wQ7aP/RUFl94z
+n0BjqsWDnCKVFHydZ0TZSpeADmXMg2VYZPcp/cQR1KjoBoDxAscis7b1XPQUg7CB
+zquq5jBVAnsNIhs7g47GWKyDUJM=
+=aCLl
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/fedora-repos.spec b/fedora-repos.spec
index dd28bbd..cf0671a 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -394,6 +394,7 @@ rm -f "$TMPRING"
 %changelog
 * Tue Feb 08 2022 Tomas Hrcka <thrcka@redhat.com> - 37-0.1
 - Setup for rawhide being F37
+- Adding F38 key
 
 * Tue Aug 17 2021 Tomas Hrcka <thrcka@redhat.com> - 36-0.3
 - Remove spurious space in RPM-GPG-KEY-fedora-37-primary (cgwalters)

From b7b688230c3bdb51906ed4b45f1a2ee5d705dc3e Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@bhujji.com>
Date: Tue, 8 Feb 2022 16:18:27 -0500
Subject: [PATCH 073/108] Setup for rawhide being F37

Adding F38 key

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
---
 fedora-repos.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index cf0671a..a75e3ed 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -77,6 +77,7 @@ Source54:       RPM-GPG-KEY-fedora-34-primary
 Source55:       RPM-GPG-KEY-fedora-35-primary
 Source56:       RPM-GPG-KEY-fedora-36-primary
 Source57:       RPM-GPG-KEY-fedora-37-primary
+Source58:       RPM-GPG-KEY-fedora-38-primary
 # When bumping Rawhide to fN, create N+1 key (and update archmap). (This
 # ensures users have the next future key installed and referenced, even if they
 # don't update very often. This will smooth out Rawhide N->N+1 transition for them).

From c68fb81c5d94e0771c9c4ba3facb599715b4ab24 Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@bhujji.com>
Date: Tue, 8 Feb 2022 16:26:37 -0500
Subject: [PATCH 074/108] Setup for rawhide being F37

Adding F38 key

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
---
 archmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/archmap b/archmap
index bb70c63..fbd1689 100644
--- a/archmap
+++ b/archmap
@@ -81,3 +81,5 @@ fedora-35-primary: x86_64 armhfp aarch64 ppc64le s390x
 fedora-36-primary: x86_64 armhfp aarch64 ppc64le s390x
 
 fedora-37-primary: x86_64 armhfp aarch64 ppc64le s390x
+
+fedora-38-primary: x86_64 armhfp aarch64 ppc64le s390x

From c581f6b90210eee33a6a0f4c6f3f8df40bf5f6b8 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Wed, 25 May 2022 11:19:08 -0400
Subject: [PATCH 075/108] Rework ELN repos

Previously, it was expected that ELN repositories could be supplemented
with Rawhide repositories. It turns out that this causes
difficult-to-identify conflicts.

This patch disables all other Fedora repos when built for ELN.

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
---
 fedora-eln.repo   | 312 ++++++++++++++++++++++++++++++++++++++++++++++
 fedora-repos.spec |  33 +++--
 2 files changed, 336 insertions(+), 9 deletions(-)

diff --git a/fedora-eln.repo b/fedora-eln.repo
index 7992bf6..0cadc0e 100644
--- a/fedora-eln.repo
+++ b/fedora-eln.repo
@@ -94,3 +94,315 @@ type=rpm
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
 skip_if_unavailable=False
+
+
+
+[eln-crb]
+name=Fedora - ELN CRB - Developmental packages for the next Enterprise Linux release
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/CRB/$basearch/os/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
+enabled=AUTO_VALUE
+countme=1
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+[eln-crb-debuginfo]
+name=Fedora - ELN CRB - Debug
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/CRB/$basearch/debug/tree
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+[eln-crb-source]
+name=Fedora - ELN CRB - Source
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/CRB/source/tree/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+
+
+[eln-extras]
+name=Fedora - ELN Extras - Developmental packages for the next Enterprise Linux release
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Extras/$basearch/os/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
+enabled=AUTO_VALUE
+countme=1
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+[eln-extras-debuginfo]
+name=Fedora - ELN Extras - Debug
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Extras/$basearch/debug/tree
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+[eln-extras-source]
+name=Fedora - ELN Extras - Source
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Extras/source/tree/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+
+
+[eln-ha]
+name=Fedora - ELN HighAvailability - Developmental packages for the next Enterprise Linux release
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/HighAvailability/$basearch/os/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
+enabled=AUTO_VALUE
+countme=1
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+[eln-ha-debuginfo]
+name=Fedora - ELN HighAvailability - Debug
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/HighAvailability/$basearch/debug/tree
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+[eln-ha-source]
+name=Fedora - ELN HighAvailability - Source
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/HighAvailability/source/tree/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+
+
+[eln-rs]
+name=Fedora - ELN ResilientStorage - Developmental packages for the next Enterprise Linux release
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/ResilientStorage/$basearch/os/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
+enabled=AUTO_VALUE
+countme=1
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+[eln-rs-debuginfo]
+name=Fedora - ELN ResilientStorage - Debug
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/ResilientStorage/$basearch/debug/tree
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+[eln-rs-source]
+name=Fedora - ELN ResilientStorage - Source
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/ResilientStorage/source/tree/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+
+
+[eln-rt]
+name=Fedora - ELN RT - Developmental packages for the next Enterprise Linux release
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/RT/$basearch/os/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
+enabled=AUTO_VALUE
+countme=1
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+[eln-rt-debuginfo]
+name=Fedora - ELN RT - Debug
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/RT/$basearch/debug/tree
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+[eln-rt-source]
+name=Fedora - ELN RT - Source
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/RT/source/tree/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+
+
+[eln-nfv]
+name=Fedora - ELN NFV - Developmental packages for the next Enterprise Linux release
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/NFV/$basearch/os/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
+enabled=AUTO_VALUE
+countme=1
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+[eln-nfv-debuginfo]
+name=Fedora - ELN NFV - Debug
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/NFV/$basearch/debug/tree
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+[eln-nfv-source]
+name=Fedora - ELN NFV - Source
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/NFV/source/tree/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+
+
+[eln-sap]
+name=Fedora - ELN SAP - Developmental packages for the next Enterprise Linux release
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAP/$basearch/os/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
+enabled=AUTO_VALUE
+countme=1
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+[eln-sap-debuginfo]
+name=Fedora - ELN SAP - Debug
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAP/$basearch/debug/tree
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+[eln-sap-source]
+name=Fedora - ELN SAP - Source
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAP/source/tree/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+
+
+[eln-saphana]
+name=Fedora - ELN SAPHANA - Developmental packages for the next Enterprise Linux release
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAPHANA/$basearch/os/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
+enabled=AUTO_VALUE
+countme=1
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+[eln-saphana-debuginfo]
+name=Fedora - ELN SAPHANA - Debug
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAPHANA/$basearch/debug/tree
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
+
+[eln-saphana-source]
+name=Fedora - ELN SAPHANA - Source
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAPHANA/source/tree/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+skip_if_unavailable=False
diff --git a/fedora-repos.spec b/fedora-repos.spec
index a75e3ed..dc33a68 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -149,12 +149,11 @@ where client's system will pull OSTree updates.
 
 %package eln
 Summary: ELN repo definitions
-Requires: fedora-repos-rawhide = %{version}-%{release}
 
 %description eln
 This package provides repository files for ELN (Enterprise Linux Next)
-packages that can be installed atop Rawhide. Note that these packages are
-experimental and should not be used in a production environment.
+packages. Note that these packages are experimental and should not be used
+in a production environment.
 
 
 %prep
@@ -199,18 +198,26 @@ for file in %{_sourcedir}/fedora*repo ; do
 done
 
 # Enable or disable repos based on current release cycle state.
-%if %{rawhide_release} == %{version}
+%if 0%{?eln}
+rawhide_enabled=0
+stable_enabled=0
+testing_enabled=0
+archive_enabled=0
+eln_enabled=1
+%elif %{rawhide_release} == %{version}
 rawhide_enabled=1
 stable_enabled=0
 testing_enabled=0
 archive_enabled=0
+eln_enabled=0
 %else
 rawhide_enabled=0
 stable_enabled=1
 testing_enabled=%{updates_testing_enabled}
 archive_enabled=1
+eln_enabled=0
 %endif
-for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-{rawhide,eln}*.repo; do
+for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-rawhide*.repo; do
     sed -i "s/^enabled=AUTO_VALUE$/enabled=${rawhide_enabled}/" $repo || exit 1
 done
 for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora{,-modular,-updates,-updates-modular}.repo; do
@@ -222,6 +229,9 @@ done
 for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-updates-archive.repo; do
     sed -i "s/^enabled=AUTO_VALUE$/enabled=${archive_enabled}/" $repo || exit 1
 done
+for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-eln*.repo; do
+    sed -i "s/^enabled=AUTO_VALUE$/enabled=${eln_enabled}/" $repo || exit 1
+done
 
 # Adjust Rawhide repo files to include Rawhide+1 GPG key.
 # This is necessary for the period when Rawhide gets bumped to N+1 and packages
@@ -260,16 +270,21 @@ for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/*.repo; do
 done
 
 # Make sure correct repos were enabled/disabled
-enabled_repos=(fedora-cisco-openh264)
+enabled_repos=()
 disabled_repos=()
-%if %{rawhide_release} == %{version}
-enabled_repos+=(fedora-rawhide fedora-rawhide-modular fedora-eln)
+
+%if 0%{?eln}
+enabled_repos+=(fedora-eln)
+disabled_repos+=(fedora fedora-modular fedora-updates fedora-updates-archive \
+  fedora-updates-modular fedora-updates-testing fedora-updates-testing-modular)
+%elif %{rawhide_release} == %{version}
+enabled_repos+=(fedora-rawhide fedora-rawhide-modular fedora-cisco-openh264)
 disabled_repos+=(fedora fedora-modular fedora-updates fedora-updates-archive \
   fedora-updates-modular fedora-updates-testing fedora-updates-testing-modular)
 %else
 enabled_repos+=(fedora fedora-modular fedora-updates fedora-updates-archive \
   fedora-updates-modular)
-disabled_repos+=(fedora-rawhide fedora-rawhide-modular fedora-eln)
+disabled_repos+=(fedora-rawhide fedora-rawhide-modular)
 %if %{updates_testing_enabled}
 enabled_repos+=(fedora-updates-testing fedora-updates-testing-modular)
 %else

From 650506b268b9c7cbea372bcf297353636814e52f Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Wed, 25 May 2022 14:25:47 -0400
Subject: [PATCH 076/108] Update changelog for ELN

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
---
 fedora-repos.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index dc33a68..fd246d7 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -4,7 +4,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        37
-Release:        0.1%{?eln:.eln%{eln}}
+Release:        0.2%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -408,6 +408,9 @@ rm -f "$TMPRING"
 
 
 %changelog
+* Wed May 25 2022 Stephen Gallagher <sgallagh@redhat.com> - 37-0.2
+- Rework Fedora ELN repositories
+
 * Tue Feb 08 2022 Tomas Hrcka <thrcka@redhat.com> - 37-0.1
 - Setup for rawhide being F37
 - Adding F38 key

From 18976ae7228070670d502d956454371d9b6a49cf Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Wed, 8 Jun 2022 09:04:49 -0400
Subject: [PATCH 077/108] ELN: don't enable layered product repos by default

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
---
 fedora-eln.repo   | 12 ++++++------
 fedora-repos.spec |  5 ++++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/fedora-eln.repo b/fedora-eln.repo
index 0cadc0e..c2c1275 100644
--- a/fedora-eln.repo
+++ b/fedora-eln.repo
@@ -179,7 +179,7 @@ skip_if_unavailable=False
 name=Fedora - ELN HighAvailability - Developmental packages for the next Enterprise Linux release
 baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/HighAvailability/$basearch/os/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
-enabled=AUTO_VALUE
+enabled=0
 countme=1
 metadata_expire=6h
 repo_gpgcheck=0
@@ -218,7 +218,7 @@ skip_if_unavailable=False
 name=Fedora - ELN ResilientStorage - Developmental packages for the next Enterprise Linux release
 baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/ResilientStorage/$basearch/os/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
-enabled=AUTO_VALUE
+enabled=0
 countme=1
 metadata_expire=6h
 repo_gpgcheck=0
@@ -257,7 +257,7 @@ skip_if_unavailable=False
 name=Fedora - ELN RT - Developmental packages for the next Enterprise Linux release
 baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/RT/$basearch/os/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
-enabled=AUTO_VALUE
+enabled=0
 countme=1
 metadata_expire=6h
 repo_gpgcheck=0
@@ -296,7 +296,7 @@ skip_if_unavailable=False
 name=Fedora - ELN NFV - Developmental packages for the next Enterprise Linux release
 baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/NFV/$basearch/os/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
-enabled=AUTO_VALUE
+enabled=0
 countme=1
 metadata_expire=6h
 repo_gpgcheck=0
@@ -335,7 +335,7 @@ skip_if_unavailable=False
 name=Fedora - ELN SAP - Developmental packages for the next Enterprise Linux release
 baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAP/$basearch/os/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
-enabled=AUTO_VALUE
+enabled=0
 countme=1
 metadata_expire=6h
 repo_gpgcheck=0
@@ -374,7 +374,7 @@ skip_if_unavailable=False
 name=Fedora - ELN SAPHANA - Developmental packages for the next Enterprise Linux release
 baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAPHANA/$basearch/os/
 #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
-enabled=AUTO_VALUE
+enabled=0
 countme=1
 metadata_expire=6h
 repo_gpgcheck=0
diff --git a/fedora-repos.spec b/fedora-repos.spec
index fd246d7..bd99376 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -4,7 +4,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        37
-Release:        0.2%{?eln:.eln%{eln}}
+Release:        0.3%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -408,6 +408,9 @@ rm -f "$TMPRING"
 
 
 %changelog
+* Wed Jun 08 2022 Stephen Gallagher <sgallagh@redhat.com> - 37-0.3
+- ELN: don't enable layered product repos by default
+
 * Wed May 25 2022 Stephen Gallagher <sgallagh@redhat.com> - 37-0.2
 - Rework Fedora ELN repositories
 

From bcab1c7770a44a5cda4d33fc9bfc0431b6ee789d Mon Sep 17 00:00:00 2001
From: Tomas Hrcka <thrcka@redhat.com>
Date: Tue, 9 Aug 2022 19:15:28 +0200
Subject: [PATCH 078/108] Rawhide is now f38

Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
---
 RPM-GPG-KEY-fedora-39-primary | 29 +++++++++++++++++++++++++++++
 fedora-repos.spec             | 11 ++++++++---
 2 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 RPM-GPG-KEY-fedora-39-primary

diff --git a/RPM-GPG-KEY-fedora-39-primary b/RPM-GPG-KEY-fedora-39-primary
new file mode 100644
index 0000000..2dc618a
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-39-primary
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+ 
+mQINBGLykg8BEADURjKtgQpQNoluifXia+U3FuqGCTQ1w7iTqx1UvNhLX6tb9Qjy
+l/vjl1iXxucrd2JBnrT/21BdtaABhu2hPy7bpcGEkG8MDinAMZBzcyzHcS/JiGHZ
+d/YmMWQUgbDlApbxFSGWiXMgT0Js5QdcywHI5oiCmV0lkZ+khZ4PkVWmk6uZgYWf
+JOG5wp5TDPnoYXlA4CLb6hu2691aDm9b99XYqEjhbeIzS9bFQrdrQzRMKyzLr8NW
+s8Pq2tgyzu8txlWdBXJyAMKldTPstqtygLL9UUdo7CIQQzWqeDbAnv+WdOmiI/hR
+etbbwNV+thkLJz0WD90C2L3JEeUJX5Qa4oPvfNLDeCKmJFEFUTCEdm0AYoQDjLJQ
+3d3q9M09thXO/jYM0cSnJDclssLNsNWfjJAerLadLwNnYRuralw7f74QSLYdJAJU
+SFShBlctWKnlhQ7ehockqtgXtWckkqPZZjGiMXwHde9b9Yyi+VqtUQWxSWny+9g9
+6tcoa3AdnmpqSTHQxYajD0EGXJ0z0NXfqxkI0lo8UxzypEBy4sARZ4XhTU73Zwk0
+LGhEUHlfyxXgRs6RRvM2UIoo+gou2M9rn/RWkhuHJNSfgrM0BmIBCjhjwGiS33Qh
+ysLDWJMdch8lsu1fTmLEFQrOB93oieOJQ0Ysi5gQY8TOT+oZvVi9pSMJuwARAQAB
+tDFGZWRvcmEgKDM5KSA8ZmVkb3JhLTM5LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
+cmc+iQJOBBMBCAA4FiEE6PI5lvIyGGQMtEy+dc9axBi450wFAmLykg8CGw8FCwkI
+BwIGFQoJCAsCBBYCAwECHgECF4AACgkQdc9axBi450yd4w//ZtghbZX5KFstOdBS
+rcbBfCK9zmRvzeejzGl6lPKfqwx7OOHYxFlRa9MYLl8QG7Aq6yRRWzzEHiSb0wJw
+WXz5tbkAmV/fpS4wnb3FDArD44u317UAnaU+UlhgK1g62lwI2dGpvTSvohMBMeBY
+B5aBd+sLi3UtiSRM2XhxvxaWwr/oFLjKDukgrPQzeV3F/XdxGhSz/GZUVFVprcrB
+h/dIo4k0Za7YVRhlVM0coOIcKbcjxAK9CCZ8+jtdIh3/BN5zJ0RFMgqSsrWYWeft
+BI3KWLbyMfRwEtp7xSi17WXbRfsSoqwIVgP+RCSaAdVuiYs/GCRsT3ydYcDvutuJ
+YZoE53yczemM/1HZZFI04zI7KBsKm9NFH0o4K2nBWuowBm59iFvWHFpX6em54cq4
+45NwY01FkSQUqntfqCWFSowwFHAZM4gblOikq2B5zHoIntCiJlPGuaJiVSw9ZpEc
++IEQfmXJjKGSkMbU9tmNfLR9skVQJizMTtoUQ12DWC+14anxnnR2hxnhUDAabV6y
+J5dGeb/ArmxQj3IMrajdNwjuk9GMeMSSS2EMY8ryOuYwRbFhBOLhGAnmM5OOSUxv
+A4ipWraXDW0bK/wXI7yHMkc6WYrdV3SIXEqJBTp7npimv3JC+exWEbTLcgvV70FP
+X55M9nDtzUSayJuEcfFP2c9KQCE=
+=J4qZ
+-----END PGP PUBLIC KEY BLOCK-----
\ No newline at end of file
diff --git a/fedora-repos.spec b/fedora-repos.spec
index bd99376..911037b 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,10 +1,10 @@
-%global rawhide_release 37
+%global rawhide_release 38
 %global updates_testing_enabled 0
 
 Summary:        Fedora package repositories
 Name:           fedora-repos
-Version:        37
-Release:        0.3%{?eln:.eln%{eln}}
+Version:        38
+Release:        0.1%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -78,6 +78,7 @@ Source55:       RPM-GPG-KEY-fedora-35-primary
 Source56:       RPM-GPG-KEY-fedora-36-primary
 Source57:       RPM-GPG-KEY-fedora-37-primary
 Source58:       RPM-GPG-KEY-fedora-38-primary
+Source59:       RPM-GPG-KEY-fedora-39-primary
 # When bumping Rawhide to fN, create N+1 key (and update archmap). (This
 # ensures users have the next future key installed and referenced, even if they
 # don't update very often. This will smooth out Rawhide N->N+1 transition for them).
@@ -408,6 +409,10 @@ rm -f "$TMPRING"
 
 
 %changelog
+* Tue Aug 09 2022 Tomas Hrcka <thrcka@redhat.com> - 38-0.1
+- Setup for rawhide being F38
+- Adding F39 key
+
 * Wed Jun 08 2022 Stephen Gallagher <sgallagh@redhat.com> - 37-0.3
 - ELN: don't enable layered product repos by default
 

From 0ff935aa0778db448ad7bf6cb8aacecdd7e4d25c Mon Sep 17 00:00:00 2001
From: Tomas Hrcka <thrcka@redhat.com>
Date: Tue, 9 Aug 2022 20:03:01 +0200
Subject: [PATCH 079/108] update archmap

Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
---
 archmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/archmap b/archmap
index fbd1689..75d0b42 100644
--- a/archmap
+++ b/archmap
@@ -83,3 +83,5 @@ fedora-36-primary: x86_64 armhfp aarch64 ppc64le s390x
 fedora-37-primary: x86_64 armhfp aarch64 ppc64le s390x
 
 fedora-38-primary: x86_64 armhfp aarch64 ppc64le s390x
+
+fedora-39-primary: x86_64 armhfp aarch64 ppc64le s390x

From 9b26c4efa4f355d66ede7e017341f5ae6ac3cb34 Mon Sep 17 00:00:00 2001
From: Tomas Hrcka <thrcka@redhat.com>
Date: Tue, 9 Aug 2022 21:04:29 +0200
Subject: [PATCH 080/108] Drop armhfp from archmap on f38,f39

Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
---
 archmap | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/archmap b/archmap
index 75d0b42..a525cda 100644
--- a/archmap
+++ b/archmap
@@ -82,6 +82,6 @@ fedora-36-primary: x86_64 armhfp aarch64 ppc64le s390x
 
 fedora-37-primary: x86_64 armhfp aarch64 ppc64le s390x
 
-fedora-38-primary: x86_64 armhfp aarch64 ppc64le s390x
+fedora-38-primary: x86_64 aarch64 ppc64le s390x
 
-fedora-39-primary: x86_64 armhfp aarch64 ppc64le s390x
+fedora-39-primary: x86_64 aarch64 ppc64le s390x

From c1334044edeef17d7b1bf2549b039551a751b7bb Mon Sep 17 00:00:00 2001
From: Tomas Hrcka <thrcka@redhat.com>
Date: Tue, 9 Aug 2022 21:21:40 +0200
Subject: [PATCH 081/108] BUmp release

Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
---
 fedora-repos.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index 911037b..d796478 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -28,7 +28,6 @@ Source6:        fedora-cisco-openh264.repo
 Source7:        fedora-updates-archive.repo
 Source8:        fedora-eln.repo
 
-
 Source10:       RPM-GPG-KEY-fedora-7-primary
 Source11:       RPM-GPG-KEY-fedora-8-primary
 Source12:       RPM-GPG-KEY-fedora-8-primary-original

From eca46ac31a00cb7f21029dfd394fc86131de7141 Mon Sep 17 00:00:00 2001
From: Tomas Hrcka <thrcka@redhat.com>
Date: Tue, 9 Aug 2022 21:23:58 +0200
Subject: [PATCH 082/108] Bump release

Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
---
 fedora-repos.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index d796478..475d42e 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -4,7 +4,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        38
-Release:        0.1%{?eln:.eln%{eln}}
+Release:        0.2%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 

From 3b053dfff1942804baed33a9de527d3e2c025161 Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Mon, 15 Aug 2022 11:04:42 -0400
Subject: [PATCH 083/108] Fix RPM-GPG-KEY-fedora-39-primary

- Remove blank space from line
- Add newline to the end of the file

This was previously throwing this error:

```
$ sudo rpm --import ./RPM-GPG-KEY-fedora-39-x86_64
error: ./RPM-GPG-KEY-fedora-39-x86_64: key 1 not an armored public key
```
---
 RPM-GPG-KEY-fedora-39-primary | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/RPM-GPG-KEY-fedora-39-primary b/RPM-GPG-KEY-fedora-39-primary
index 2dc618a..3c27a91 100644
--- a/RPM-GPG-KEY-fedora-39-primary
+++ b/RPM-GPG-KEY-fedora-39-primary
@@ -1,5 +1,5 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
- 
+
 mQINBGLykg8BEADURjKtgQpQNoluifXia+U3FuqGCTQ1w7iTqx1UvNhLX6tb9Qjy
 l/vjl1iXxucrd2JBnrT/21BdtaABhu2hPy7bpcGEkG8MDinAMZBzcyzHcS/JiGHZ
 d/YmMWQUgbDlApbxFSGWiXMgT0Js5QdcywHI5oiCmV0lkZ+khZ4PkVWmk6uZgYWf
@@ -26,4 +26,4 @@ J5dGeb/ArmxQj3IMrajdNwjuk9GMeMSSS2EMY8ryOuYwRbFhBOLhGAnmM5OOSUxv
 A4ipWraXDW0bK/wXI7yHMkc6WYrdV3SIXEqJBTp7npimv3JC+exWEbTLcgvV70FP
 X55M9nDtzUSayJuEcfFP2c9KQCE=
 =J4qZ
------END PGP PUBLIC KEY BLOCK-----
\ No newline at end of file
+-----END PGP PUBLIC KEY BLOCK-----

From f1bd9712f80d2a8dee4b469e4c6e2b3a8dc33ae8 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Tue, 16 Aug 2022 21:55:19 -0400
Subject: [PATCH 084/108] Bump release, update changelog

---
 fedora-repos.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index 475d42e..4a2c669 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -4,7 +4,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        38
-Release:        0.2%{?eln:.eln%{eln}}
+Release:        0.3%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -408,6 +408,12 @@ rm -f "$TMPRING"
 
 
 %changelog
+* Tue Aug 16 2022 Adam Williamson <awilliam@redhat.com> - 38.0-3
+- Fix RPM-GPG-KEY-fedora-39-primary (dustymabe)
+
+* Tue Aug 09 2022 Tomas Hrcka <thrcka@redhat.com> - 38-0.2
+- Drop armhfp from archmap on f38,f39
+
 * Tue Aug 09 2022 Tomas Hrcka <thrcka@redhat.com> - 38-0.1
 - Setup for rawhide being F38
 - Adding F39 key

From f2cbb4bb926df42720899375b18652192f0d6f65 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Tue, 16 Aug 2022 22:47:08 -0400
Subject: [PATCH 085/108] Add a check that RPM can import the same keys as GPG

`rpm --import` seems to be stricter than `gpg --import` on white
space issues - gpg imported the problematic Fedora 39 key file
that was just fixed fine, but rpm refused it. So let's check
that `rpm --import` works on all the keys we check `gpg --import`
on too.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 fedora-repos.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index 4a2c669..19e0312 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -17,7 +17,7 @@ Requires:       fedora-repos-rawhide = %{version}-%{release}
 Requires:       fedora-gpg-keys >= %{version}-%{release}
 BuildArch:      noarch
 # Required by %%check
-BuildRequires:  gnupg sed
+BuildRequires:  gnupg sed rpm
 
 Source1:        archmap
 Source2:        fedora.repo
@@ -357,14 +357,17 @@ for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-rawhide*.repo; do
     done <<< "$gpg_lines"
 done
 
-# Check arch keys exists on supported architectures
+# Check arch keys exists on supported architectures, and RPM considers
+# them valid
 TMPRING=$(mktemp)
+DBPATH=$(mktemp -d)
 for VER in %{version} %{rawhide_release} ${rawhide_next}; do
   echo -n > "$TMPRING"
   for ARCH in $(sed -ne "s/^fedora-${VER}-primary://p" %{_sourcedir}/archmap)
   do
     gpg --no-default-keyring --keyring="$TMPRING" \
       --import $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-fedora-$VER-$ARCH
+    rpm --dbpath "$DBPATH" --import $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-fedora-$VER-$ARCH --test
   done
   # Ensure some arch key was imported
   gpg --no-default-keyring --keyring="$TMPRING" --list-keys | grep -A 2 '^pub\s'

From 25754d7fa96657ceabbaa8da84c0fb7ac9d5dab0 Mon Sep 17 00:00:00 2001
From: Tomas Hrcka <thrcka@redhat.com>
Date: Wed, 25 Jan 2023 13:54:51 +0100
Subject: [PATCH 086/108] Add fedora 40 key

Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
---
 RPM-GPG-KEY-fedora-40-primary | 29 +++++++++++++++++++++++++++++
 fedora-repos.spec             |  6 +++++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 RPM-GPG-KEY-fedora-40-primary

diff --git a/RPM-GPG-KEY-fedora-40-primary b/RPM-GPG-KEY-fedora-40-primary
new file mode 100644
index 0000000..19238f7
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-40-primary
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGPQTCwBEADFUL0EQLzwpKHtlPkacVI156F2LnWp6K69g/6yzllidHI3b7EV
+QgQ9/Kdou6wNuOahNKa6WcEi6grEXexD7pAcu4xdRUp79XxQy5pC7Aq2/Dwf0vRL
+2y0kqof+C7iSzhHsfLoaqKKeh2njAo1KLZXYTHAWAMbXEyO/FJevaHLXe2+yYd7j
+luD58gyXgGDXXJ2lymLqs2jobjWdmGPNZGFl36RP3Dnk0FpbdH78kyIIsc2foYuF
+00rnuumwCtK3V58VOZo6IkaYk2irdyeetmJjVHwLHwJB3EaAwGy9Z2oAH3LxxFfk
+rQb0DH0Nzb3fpEziopOOqSi+6guV4RHUKAkCUMu+Mo5XwFVPUAIfNRTVqoIaEasC
+WO26lhkB87wwIvyb/TPGSeh6laHPRf0QOUOLkugdkSHoaJFWoTCcu9Y4aeDpf+ZQ
+fMVmkJNRS1tXONgz+pDk1rro/tNrkusYG18xjvSZTB0P0C4b4+jgK5l7me0NU6G3
+Ww/hIng5lxWfXgE9bpxlN834v1xy5Z3v17guJu1ec/jzKzQQ4356wyegXURjYoWe
+awcnK1S+9gxivnkOk1bGLNxrEh5vB6PDcI1VQ1ECH50EHyvE1IXJDaaStdAkacv2
+qHcd15CnlBW1LYFj0CHs/sGu9FD0iSF95OVRX4gjg9Wa4f8KvtEO/f+FeQARAQAB
+tDFGZWRvcmEgKDQwKSA8ZmVkb3JhLTQwLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
+cmc+iQJOBBMBCAA4FiEEEV35rvhXhT7oRF0KBydwfqFbecwFAmPQTCwCGw8FCwkI
+BwIGFQoJCAsCBBYCAwECHgECF4AACgkQBydwfqFbecxJOw//XaoJG3zN01bVM63H
+nFmMW/EnLzKrZqH8ZNq8CP9ycoc4q8SYcMprHKG9jufzj5/FhtpYecp3kBMpSYHt
+Vu46LS9NajJDwdfvUMezVbieNIQ8icTR5s5IUYFlc47eG6PRe3k0n5fOPcIb6q82
+byrK3dQnanOcVdoGU7QO9LAAHO9hg0zgZa0MxQAlDQov3dZcr7u7qGcQmU5JzcRS
+JgfDxHxDuMjmq6Kd0/UwD00kd2ptZgRls0ntXdm9CZGtQ/Q0baJ3eRzccpd/8bxy
+RWF9MnOdmV6ojcFKYECjEzcuheUlcKQH9rLkeBSfgrIlK3L7LG8bg5ouZLdx17rQ
+XABNQGmJTaGAiEnS/48G3roMS8R7fhUljcKr6t63QQQJ2qWdPvI6EMC2xKZsLHK4
+XiUvrmJpUprvEQSKBUOf/2zuXDBshtAnoKh7h5aG+TvozL4yNG5DKpSH3MRj1E43
+KoMsP/GN/X5h+vJnvhiCWxNMPP81Op0czBAgukBm627FTnsvieJOOrzyxb1s75+W
+56gJombmhzUfzr88AYY9mFy7diTw/oldDZcfwa8rvOAGJVDlyr2hqkLoGl+5jPex
+slt3NF4caE/wP9wPMgFRkmMOr8eiRhjlWLrO6mQdBp7Qsj3kEXioP+CZ1cv/sbaK
+4DM7VidB4PLrMFQMaf0LpjpC2DM=
+=wOl2
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/fedora-repos.spec b/fedora-repos.spec
index 19e0312..c02a038 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -4,7 +4,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        38
-Release:        0.3%{?eln:.eln%{eln}}
+Release:        0.4%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -78,6 +78,7 @@ Source56:       RPM-GPG-KEY-fedora-36-primary
 Source57:       RPM-GPG-KEY-fedora-37-primary
 Source58:       RPM-GPG-KEY-fedora-38-primary
 Source59:       RPM-GPG-KEY-fedora-39-primary
+Source60:       RPM-GPG-KEY-fedora-40-primary
 # When bumping Rawhide to fN, create N+1 key (and update archmap). (This
 # ensures users have the next future key installed and referenced, even if they
 # don't update very often. This will smooth out Rawhide N->N+1 transition for them).
@@ -411,6 +412,9 @@ rm -f "$TMPRING"
 
 
 %changelog
+* Wed Jan 25 2023 Tomas Hrcka <thrcka@redhat.com> - 38-0.4
+- Add RPM-GPG-KEY-fedora-40-primary
+
 * Tue Aug 16 2022 Adam Williamson <awilliam@redhat.com> - 38.0-3
 - Fix RPM-GPG-KEY-fedora-39-primary (dustymabe)
 

From b0742b9e487ec6f71dd5cfb98f9c7fe174310cff Mon Sep 17 00:00:00 2001
From: Tomas Hrcka <thrcka@redhat.com>
Date: Sun, 29 Jan 2023 14:21:37 +0100
Subject: [PATCH 087/108] Update archmap for f40 key

Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
---
 archmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/archmap b/archmap
index a525cda..ccfa584 100644
--- a/archmap
+++ b/archmap
@@ -85,3 +85,5 @@ fedora-37-primary: x86_64 armhfp aarch64 ppc64le s390x
 fedora-38-primary: x86_64 aarch64 ppc64le s390x
 
 fedora-39-primary: x86_64 aarch64 ppc64le s390x
+
+fedora-40-primary: x86_64 aarch64 ppc64le s390x

From 043010400f007c9f7167c9411d4463f4c2f08b9e Mon Sep 17 00:00:00 2001
From: Tomas Hrcka <thrcka@redhat.com>
Date: Wed, 8 Feb 2023 22:07:13 +0100
Subject: [PATCH 088/108] Rawhide is now f39

Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
---
 fedora-repos.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index c02a038..9fdda40 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,10 +1,10 @@
-%global rawhide_release 38
+%global rawhide_release 39
 %global updates_testing_enabled 0
 
 Summary:        Fedora package repositories
 Name:           fedora-repos
-Version:        38
-Release:        0.4%{?eln:.eln%{eln}}
+Version:        39
+Release:        0.1%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -412,6 +412,9 @@ rm -f "$TMPRING"
 
 
 %changelog
+* Wed Feb 08 2023 Tomas Hrcka <thrcka@redhat.com> - 39-0.1
+- Setup for rawhide being F39
+
 * Wed Jan 25 2023 Tomas Hrcka <thrcka@redhat.com> - 38-0.4
 - Add RPM-GPG-KEY-fedora-40-primary
 

From 93b2c8add81f2d6f83874ce53b080adbc4fe6826 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Sat, 18 Feb 2023 10:45:08 -0800
Subject: [PATCH 089/108] Add f38/f39 ima certs

I'm not sure the directory ( /etc/pki/rpm-ima ) or the format is whats
destired here as I have not had time to play with IMA. Hopefully the
cert or the pem or the der are one the desired format here.

Happy to adjust with feedback from IMA users any of this.

CC: @pbrobinson @puiterwijk @fche

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 fedora-38-ima.cert |  11 +++++++++++
 fedora-38-ima.der  | Bin 0 -> 427 bytes
 fedora-38-ima.pem  |   4 ++++
 fedora-39-ima.cert |  11 +++++++++++
 fedora-39-ima.der  | Bin 0 -> 426 bytes
 fedora-39-ima.pem  |   4 ++++
 fedora-repos.spec  |  18 +++++++++++++++++-
 7 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 fedora-38-ima.cert
 create mode 100644 fedora-38-ima.der
 create mode 100644 fedora-38-ima.pem
 create mode 100644 fedora-39-ima.cert
 create mode 100644 fedora-39-ima.der
 create mode 100644 fedora-39-ima.pem

diff --git a/fedora-38-ima.cert b/fedora-38-ima.cert
new file mode 100644
index 0000000..e0d2819
--- /dev/null
+++ b/fedora-38-ima.cert
@@ -0,0 +1,11 @@
+-----BEGIN CERTIFICATE-----
+MIIBpzCCASygAwIBAgIBKjAKBggqhkjOPQQDAzAbMRkwFwYDVQQDExBGZWRvcmEg
+MzggSU1BIENBMCAXDTIzMDIxODE4MDMxNloYDzIwNTMwMjE4MTgwMzE2WjAcMRow
+GAYDVQQDExFGZWRvcmEgMzggSU1BIEtleTBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABI+RFc41GuD1tyN2P0U5C4H4z9xJbuAMinV18SJXVulVYt0DBKT+Xme5WZpQ
+dvPdkBaW1jCzSeI15T3oTIKjYL6jXjBcMAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgw
+FoAU7MSMKFJGsKYZxjsInt2Dp7i3db8wKwYJYIZIAYb4QgENBB5JTUEgc2lnbmF0
+dXJlIHZlcmlmaWNhdGlvbiBrZXkwCgYIKoZIzj0EAwMDaQAwZgIxAKMa1pxV4PM9
+BSRqnYWpLg2bfunWRo2fsqn/HaI7qdLZZTUivtSWcTJFif7c5YHWggIxAIgZnzog
+XLA6WvFbmimjFNjQCKnxuvo/f2OzbK2JPj7XofpJrhf0frL2Cb1r7novgw==
+-----END CERTIFICATE-----
diff --git a/fedora-38-ima.der b/fedora-38-ima.der
new file mode 100644
index 0000000000000000000000000000000000000000..238ae6c307633da1965ba194ab4d40c39d26318f
GIT binary patch
literal 427
zcmXqLVq9*}#Hh1?nTe5!iBZddi;Y98&EuRc3p2BUw4tPdI2&^)3$w6*TWU&vQKEve
zg@UKAqk^-efr2=%k+Ff1p@pG^fw7@klmx$#fhn?pfsCP)fdoXmAgXrn)JlU$17S9H
zuvJWqP&=6!*_oXfSo$Z5o->tt@O8U#nZ2tecjJ%qcRceR@N|`yepCt%dl{N^mzibB
zzqs_Bk+TBIKHr@nHtm|hX3s~aPi<fLG%Zfpw>Zuq#(;;7IaF4dk?}tZlL3Q)Jcy^v
zB4HrbAoAu&k4BK&hGmk+tU2c0ZC<`(d+B}yZ8pw?HV?+OA5M(CEOH<(7H6jCC6<&H
zr7D!A7G<VoCMT9;=I1G7r&c0|5pyPkK^l`G!(ypxb3z|{wq;exn%lZkk9T(6%WH1E
z^Ea*hFT2Qk<)xdcrb_#+Oe-{U?fiG=Y2&pfCPRh}$@x|aF&nI+K1R>dTr6_q0>{da
iyMEc%CvVPK+i7Qaec><9b>d&@HhtsVoBggzzZn3_$CG~m

literal 0
HcmV?d00001

diff --git a/fedora-38-ima.pem b/fedora-38-ima.pem
new file mode 100644
index 0000000..e323fa2
--- /dev/null
+++ b/fedora-38-ima.pem
@@ -0,0 +1,4 @@
+-----BEGIN PUBLIC KEY-----
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEj5EVzjUa4PW3I3Y/RTkLgfjP3Elu
+4AyKdXXxIldW6VVi3QMEpP5eZ7lZmlB2892QFpbWMLNJ4jXlPehMgqNgvg==
+-----END PUBLIC KEY-----
diff --git a/fedora-39-ima.cert b/fedora-39-ima.cert
new file mode 100644
index 0000000..78c7bb4
--- /dev/null
+++ b/fedora-39-ima.cert
@@ -0,0 +1,11 @@
+-----BEGIN CERTIFICATE-----
+MIIBpjCCASygAwIBAgIBKjAKBggqhkjOPQQDAzAbMRkwFwYDVQQDExBGZWRvcmEg
+MzkgSU1BIENBMCAXDTIzMDIxODE4MDQxNloYDzIwNTMwMjE4MTgwNDE2WjAcMRow
+GAYDVQQDExFGZWRvcmEgMzkgSU1BIEtleTBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABPVBlbhn8Lz9PLD0LqpySa9jgxZTdImp2xbyMes+L91MntWFKj5hR86He9kN
+87KphPuso6WdRPDLf4ouarSaNdGjXjBcMAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgw
+FoAUpxQ+y2TQxMrznQx9xDhFRthT/1IwKwYJYIZIAYb4QgENBB5JTUEgc2lnbmF0
+dXJlIHZlcmlmaWNhdGlvbiBrZXkwCgYIKoZIzj0EAwMDaAAwZQIxALJAz24hm4Lu
+P9eFeAyCGKjWdqrBIAh2Ec7kUpkALqvfZHZhP/qhhqAxKEOO6v66ZgIwYObLdWmX
+TGN2JGRLY6KwcUoprXAECTYGX9HjGqv2/7xrt7hCSwqjpIr29XXOi2mv
+-----END CERTIFICATE-----
diff --git a/fedora-39-ima.der b/fedora-39-ima.der
new file mode 100644
index 0000000000000000000000000000000000000000..0d13baa62d75c2fc8404a539c9e554a8a3dc33ec
GIT binary patch
literal 426
zcmXqLVq9j>#Hh1?nTe5!iBZddi;Y98&EuRc3p2BUw4tPdI2&^)3$w6*TWU&vQKEve
zrGlrgqk^-efr2=%k+Ff1p@pG^fr+76lmx$#fhn?pfsCP)fdoXmAgXrn)JlU$17S9H
zuvJWqP&=6!*_oXfSiU+=-I4xb&tIDjU-VWLd9F`x77H%vTzOmUli_PS{kuN%uC{8~
zCAyz$ufECqdDF_4-)j~xo$K=9bbXgz)|OeO7Z=AF#2E0fF^9?uGcx{XVKQJakO%RU
zStJa^8bp?h*qu(faOBkIxjeN;EL`1g1pf~*&}QRIX!Brf`{BgM%OVHzVsU1AUSdgU
zQK~{&YEfodW^!UlW`3SRc4{SZ7%^us7^E^8GHh}<pQkvx>7D)c)(V~`i51t%RvlE}
zC=)#QBxojs-s<})Wr_B`7Pc)g)Nt;5^>0@ilR?6>)1{fyeUi&mQoNHFZ7B58TwB1x
hX~q_R@v+qEZ~ymXZ{OkM&9!(**SD{w=ejf30|211lY0OF

literal 0
HcmV?d00001

diff --git a/fedora-39-ima.pem b/fedora-39-ima.pem
new file mode 100644
index 0000000..2856eb1
--- /dev/null
+++ b/fedora-39-ima.pem
@@ -0,0 +1,4 @@
+-----BEGIN PUBLIC KEY-----
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE9UGVuGfwvP08sPQuqnJJr2ODFlN0
+ianbFvIx6z4v3Uye1YUqPmFHzod72Q3zsqmE+6yjpZ1E8Mt/ii5qtJo10Q==
+-----END PUBLIC KEY-----
diff --git a/fedora-repos.spec b/fedora-repos.spec
index 9fdda40..d8e41e0 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -4,7 +4,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        39
-Release:        0.1%{?eln:.eln%{eln}}
+Release:        0.2%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -93,6 +93,14 @@ Source150:      RPM-GPG-KEY-fedora-iot-2019
 Source151:      fedora.conf
 Source152:      fedora-compose.conf
 
+# ima certs
+Source500:      fedora-38-ima.cert
+Source501:      fedora-38-ima.der
+Source502:      fedora-38-ima.pem
+Source503:      fedora-39-ima.cert
+Source504:      fedora-39-ima.der
+Source505:      fedora-39-ima.pem
+
 %description
 Fedora package repository files for yum and dnf along with gpg public keys.
 
@@ -192,6 +200,10 @@ done
 ln -s RPM-GPG-KEY-fedora-%{version}-primary RPM-GPG-KEY-%{version}-fedora
 popd
 
+# Install the ima keys
+install -d -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-ima
+install -m 644 %{_sourcedir}/fedora*ima.* $RPM_BUILD_ROOT/etc/pki/rpm-ima/
+
 # Install repo files
 install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
 for file in %{_sourcedir}/fedora*repo ; do
@@ -400,6 +412,7 @@ rm -f "$TMPRING"
 %files -n fedora-gpg-keys
 %dir /etc/pki/rpm-gpg
 /etc/pki/rpm-gpg/RPM-GPG-KEY-*
+/etc/pki/rpm-ima/fedora*ima*
 
 
 %files ostree
@@ -412,6 +425,9 @@ rm -f "$TMPRING"
 
 
 %changelog
+* Sat Feb 18 2023 Kevin Fenzi <kevin@scrye.com> - 39-0.2
+- Include IMA public certs.
+
 * Wed Feb 08 2023 Tomas Hrcka <thrcka@redhat.com> - 39-0.1
 - Setup for rawhide being F39
 

From 00b35f8d4288e7f4360992a47da43a8d2d96fe7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Mon, 10 Jul 2023 17:54:56 +0200
Subject: [PATCH 090/108] Drop fedora-repos-modular and
 fedora-repos-rawhide-modular packages

https://fedoraproject.org/wiki/Changes/RetireModularity
---
 RPM-GPG-KEY-fedora-modularity       | 29 ------------
 fedora-modular.repo                 | 36 ---------------
 fedora-rawhide-modular.repo         | 57 -----------------------
 fedora-repos.spec                   | 71 +++++++++--------------------
 fedora-updates-modular.repo         | 36 ---------------
 fedora-updates-testing-modular.repo | 36 ---------------
 6 files changed, 21 insertions(+), 244 deletions(-)
 delete mode 100644 RPM-GPG-KEY-fedora-modularity
 delete mode 100644 fedora-modular.repo
 delete mode 100644 fedora-rawhide-modular.repo
 delete mode 100644 fedora-updates-modular.repo
 delete mode 100644 fedora-updates-testing-modular.repo

diff --git a/RPM-GPG-KEY-fedora-modularity b/RPM-GPG-KEY-fedora-modularity
deleted file mode 100644
index 99b0291..0000000
--- a/RPM-GPG-KEY-fedora-modularity
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFkbN5MBEAC9zjfb8joJxrX0eawhKizSZlKnAaNXhGeg5NauRy2t34BVosbO
-e1z5tohrV7OAhB1X97ZkrsKg0ENTwlTYn/DI/bTU0Z+OG/bp7Fj07jMuYEcobKCq
-5BkspPaW9pHZ/Z070ZZxPpccWvGt1WD/KIno1J98Hszh+KvpDOW9voLdOc0KBvrw
-gZuAUB53Cjljeb6x871IFjF0UgvuPlklF7GlOU8mN9OoMDGUU8lr9qhYSkdFz9Us
-NyHLWDi3ySHYWF7L7NdOKE+5j1emy1kNt5gaTr6XTPOhfvq8VZHZA/AXLRGB9TkQ
-W6/VNzBbiEV7GT6ypDjHQ0ir0N+M0CZtOOBEIwToDWj/8pSO+onT/ChCxO0o0o96
-zjKPcPocxlVZE31klARMsHfG8Oi6uw1oHEfQH60yZYwCdA2GRu3OK6N/t/tqXH96
-WfOh2AjPiHvYf8Wuli1l2OMGj7Uzo6oxuS4nzB1zz4G1KEGDZbned0o65fcxi0+4
-B8pAvnucBI+AE78HaR9/ehAsI2P7KMP6WiKPO5BfELq2wC4bWaZbROqUuGgQ6wwK
-4C6oP27ug9n/ce5GlHTPNenAeC8rtUGCWv+2XayHdAG4rHB5VLDywyD+/6bwhVM4
-gPIzKkm7exR+mylwsNiXl7gwBgdNdal4p2rY0hJuLwsx4lLFHXFVjFRtxwARAQAB
-tEhNb2R1bGFyIEZlZG9yYSAoZmVkb3JhLW1vZHVsYXJpdHkpIDxmZWRvcmEtbW9k
-dWxhcml0eUBmZWRvcmFwcm9qZWN0Lm9yZz6JAj4EEwECACgFAlkbN5MCGw8FCSis
-we0GCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEFvBtSejzE5i6f8P/1AeJgzC
-GDBFKE2RLlZXtqDv+khlBeSVVRrfLyiJNjEnUFq6X6XhDDb8ldZq4JpUB0sy8Eux
-NBef3n1Yw67XY5ZWOdDgo+ci2yeog7Ch5Hv59jvwpwnOnsc8/JOUwAz4EkxjloUh
-YV3afXKFOM15HAKFRJ/OerKQSy0KWHsd9KWIgBEOb5FAwrH86n3zLuuAUnjsiE7V
-kXh2zxehuD+rv35u17CL3H5R3tO3V1xzw4oAMoIspuJxipBB2+nXN6A1iFw1yQA8
-5g91tUmJ+6jwLYpNhhgqkPCy/3j05Ut+hyP2TfVushGfwphXc3cg8UWbRA1OgzXS
-A9VoVwp/lcud4NlJ2OXIvCALgCcYrEQ/hxEROeqNHGsijgQ+1TEbh5fqbSOn3aZf
-dYp03ADkJvvS1a9U7f+dCpiUNXemj6nfCT5BsKtUx59GUdZrrfSMbtsbeuwHyWRp
-LAUJyfckeck85DBzzqzdjO+vpZCvcOloORCwMKHyM4JwqlW66Atkl3NnnVSFy/XD
-axzUVmuyFC9FkE3y/ySzyuvz7szMuh2Eb7bOZIieidmIEHyIWSzUV0yAp0x/kL+m
-dDd9eU7zoDJg2OP52kp5+kTrrpviBoSMZEfZ1qHuFWlW0S53d3U9r6Q0UR8Mcp9X
-wpBnI/lOAxRdO7Gth1pRlzZOIiZYJfBx0IDp
-=kX7M
------END PGP PUBLIC KEY BLOCK-----
diff --git a/fedora-modular.repo b/fedora-modular.repo
deleted file mode 100644
index f511170..0000000
--- a/fedora-modular.repo
+++ /dev/null
@@ -1,36 +0,0 @@
-[fedora-modular]
-name=Fedora Modular $releasever - $basearch
-#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Modular/$basearch/os/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch
-enabled=AUTO_VALUE
-countme=1
-metadata_expire=AUTO_VALUE
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[fedora-modular-debuginfo]
-name=Fedora Modular $releasever - $basearch - Debug
-#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Modular/$basearch/debug/tree/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-debug-$releasever&arch=$basearch
-enabled=0
-metadata_expire=AUTO_VALUE
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[fedora-modular-source]
-name=Fedora Modular $releasever - Source
-#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Modular/source/tree/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-source-$releasever&arch=$basearch
-enabled=0
-metadata_expire=AUTO_VALUE
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
diff --git a/fedora-rawhide-modular.repo b/fedora-rawhide-modular.repo
deleted file mode 100644
index d4ecfa1..0000000
--- a/fedora-rawhide-modular.repo
+++ /dev/null
@@ -1,57 +0,0 @@
-# These packages are untested and still under development. This
-# repository is used for development of new releases.
-#
-# This repository can see significant daily turnover and major
-# functionality changes which cause unexpected problems with other
-# development packages. Please use these packages if you want to work
-# with the Fedora developers by testing these new development packages.
-#
-# # https://admin.fedoraproject.org/mailman/listinfo/test (Subscription
-# Required) is available as a discussion forum for
-# testing and troubleshooting for development packages in conjunction
-# with new test releases.
-#
-# More information is available at http://fedoraproject.org/wiki/Testing
-#
-# Reproducible and reportable issues should be filed at
-# http://bugzilla.redhat.com/.
-#
-# Product: Fedora
-# Version: rawhide-modular
-
-[rawhide-modular]
-name=Fedora - Modular Rawhide - Developmental packages for the next Fedora release
-#baseurl=http://download.example/pub/fedora/linux/development/rawhide/Modular/$basearch/os/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular&arch=$basearch
-enabled=AUTO_VALUE
-countme=1
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-rawhide-$basearch AUTO_VALUE
-skip_if_unavailable=False
-
-[rawhide-modular-debuginfo]
-name=Fedora - Modular Rawhide - Debug
-#baseurl=http://download.example/pub/fedora/linux/development/rawhide/Modular/$basearch/debug/tree/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular-debug&arch=$basearch
-enabled=0
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-rawhide-$basearch AUTO_VALUE
-skip_if_unavailable=False
-
-[rawhide-modular-source]
-name=Fedora - Modular Rawhide - Source
-#baseurl=http://download.example/pub/fedora/linux/development/rawhide/Modular/source/tree/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular-source&arch=$basearch
-enabled=0
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-rawhide-$basearch AUTO_VALUE
-skip_if_unavailable=False
diff --git a/fedora-repos.spec b/fedora-repos.spec
index d8e41e0..4ee194a 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -4,13 +4,14 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        39
-Release:        0.2%{?eln:.eln%{eln}}
+Release:        0.3%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
 Provides:       fedora-repos(%{version}) = %{release}
 Requires:       system-release(%{version})
 Obsoletes:      fedora-repos < 33-0.7
+Obsoletes:      fedora-repos-modular < 39-0.3
 %if %{rawhide_release} == %{version}
 Requires:       fedora-repos-rawhide = %{version}-%{release}
 %endif
@@ -83,12 +84,6 @@ Source60:       RPM-GPG-KEY-fedora-40-primary
 # ensures users have the next future key installed and referenced, even if they
 # don't update very often. This will smooth out Rawhide N->N+1 transition for them).
 
-Source100:      fedora-modular.repo
-Source101:      fedora-updates-modular.repo
-Source102:      fedora-updates-testing-modular.repo
-Source103:      fedora-rawhide-modular.repo
-Source104:      RPM-GPG-KEY-fedora-modularity
-
 Source150:      RPM-GPG-KEY-fedora-iot-2019
 Source151:      fedora.conf
 Source152:      fedora-compose.conf
@@ -104,21 +99,11 @@ Source505:      fedora-39-ima.pem
 %description
 Fedora package repository files for yum and dnf along with gpg public keys.
 
-%package modular
-Summary:        Fedora modular package repositories
-Requires:       fedora-repos = %{version}-%{release}
-%if %{rawhide_release} == %{version}
-Requires:       fedora-repos-rawhide-modular = %{version}-%{release}
-%endif
-Obsoletes:      fedora-repos < 33-0.7
-
-%description modular
-This package provides the repo definitions with modular packages.
-
 %package rawhide
 Summary:        Rawhide repo definitions
 Requires:       fedora-repos = %{version}-%{release}
 Obsoletes:      fedora-repos-rawhide < 33-0.7
+Obsoletes:      fedora-repos-rawhide-modular < 39-0.3
 
 %description rawhide
 This package provides the rawhide repo definitions.
@@ -132,15 +117,6 @@ This package provides the repo definition for the updates archive repo.
 It is a package repository that contains any RPM that has made it to
 stable in Bodhi and been available in the Fedora updates repo in the past.
 
-%package rawhide-modular
-Summary:        Rawhide modular repo definitions
-Requires:       fedora-repos = %{version}-%{release}
-Requires:       fedora-repos-rawhide = %{version}-%{release}
-Obsoletes:      fedora-repos-rawhide < 33-0.7
-
-%description rawhide-modular
-This package provides the rawhide modular repo definitions.
-
 %package -n fedora-gpg-keys
 Summary:        Fedora RPM keys
 
@@ -233,10 +209,10 @@ eln_enabled=0
 for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-rawhide*.repo; do
     sed -i "s/^enabled=AUTO_VALUE$/enabled=${rawhide_enabled}/" $repo || exit 1
 done
-for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora{,-modular,-updates,-updates-modular}.repo; do
+for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora{,-updates}.repo; do
     sed -i "s/^enabled=AUTO_VALUE$/enabled=${stable_enabled}/" $repo || exit 1
 done
-for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-updates-testing{,-modular}.repo; do
+for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-updates-testing.repo; do
     sed -i "s/^enabled=AUTO_VALUE$/enabled=${testing_enabled}/" $repo || exit 1
 done
 for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-updates-archive.repo; do
@@ -262,7 +238,7 @@ expire_value='6h'
 %else
 expire_value='7d'
 %endif
-for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora{,-modular}.repo; do
+for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora.repo; do
     sed -i "/^metadata_expire=/ s/AUTO_VALUE/${expire_value}/" \
         $repo || exit 1
 done
@@ -288,20 +264,19 @@ disabled_repos=()
 
 %if 0%{?eln}
 enabled_repos+=(fedora-eln)
-disabled_repos+=(fedora fedora-modular fedora-updates fedora-updates-archive \
-  fedora-updates-modular fedora-updates-testing fedora-updates-testing-modular)
+disabled_repos+=(fedora fedora-updates fedora-updates-archive \
+  fedora-updates-testing)
 %elif %{rawhide_release} == %{version}
-enabled_repos+=(fedora-rawhide fedora-rawhide-modular fedora-cisco-openh264)
-disabled_repos+=(fedora fedora-modular fedora-updates fedora-updates-archive \
-  fedora-updates-modular fedora-updates-testing fedora-updates-testing-modular)
+enabled_repos+=(fedora-rawhide fedora-cisco-openh264)
+disabled_repos+=(fedora fedora-updates fedora-updates-archive \
+  fedora-updates-testing)
 %else
-enabled_repos+=(fedora fedora-modular fedora-updates fedora-updates-archive \
-  fedora-updates-modular)
-disabled_repos+=(fedora-rawhide fedora-rawhide-modular)
+enabled_repos+=(fedora fedora-updates fedora-updates-archive)
+disabled_repos+=(fedora-rawhide)
 %if %{updates_testing_enabled}
-enabled_repos+=(fedora-updates-testing fedora-updates-testing-modular)
+enabled_repos+=(fedora-updates-testing)
 %else
-disabled_repos+=(fedora-updates-testing fedora-updates-testing-modular)
+disabled_repos+=(fedora-updates-testing)
 %endif
 %endif
 
@@ -320,7 +295,7 @@ done
 
 # Make sure updates-testing is not enabled in a Final (stable) release
 %if "%{release}" >= "1"
-for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-updates-testing{,-modular}.repo; do
+for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-updates-testing.repo; do
     if grep -q 'enabled=1' $repo; then
         echo "ERROR: Repo $repo should be disabled in a stable release, but it isn't"
         exit 1
@@ -334,7 +309,7 @@ expire_value='6h'
 %else
 expire_value='7d'
 %endif
-for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora{,-modular}.repo; do
+for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora.repo; do
     lines=$(grep '^metadata_expire=' $repo | sort | uniq)
     if [ "$(echo "$lines" | wc -l)" -ne 1 ]; then
         echo "ERROR: Non-matching metadata_expire lines in $repo: $lines"
@@ -394,20 +369,12 @@ rm -f "$TMPRING"
 %config(noreplace) /etc/yum.repos.d/fedora-updates.repo
 %config(noreplace) /etc/yum.repos.d/fedora-updates-testing.repo
 
-%files modular
-%config(noreplace) /etc/yum.repos.d/fedora-modular.repo
-%config(noreplace) /etc/yum.repos.d/fedora-updates-modular.repo
-%config(noreplace) /etc/yum.repos.d/fedora-updates-testing-modular.repo
-
 %files archive
 %config(noreplace) /etc/yum.repos.d/fedora-updates-archive.repo
 
 %files rawhide
 %config(noreplace) /etc/yum.repos.d/fedora-rawhide.repo
 
-%files rawhide-modular
-%config(noreplace) /etc/yum.repos.d/fedora-rawhide-modular.repo
-
 
 %files -n fedora-gpg-keys
 %dir /etc/pki/rpm-gpg
@@ -425,6 +392,10 @@ rm -f "$TMPRING"
 
 
 %changelog
+* Mon Jul 10 2023 Miro Hrončok <mhroncok@redhat.com> - 39-0.3
+- Drop fedora-repos-modular and fedora-repos-rawhide-modular packages
+- https://fedoraproject.org/wiki/Changes/RetireModularity
+
 * Sat Feb 18 2023 Kevin Fenzi <kevin@scrye.com> - 39-0.2
 - Include IMA public certs.
 
diff --git a/fedora-updates-modular.repo b/fedora-updates-modular.repo
deleted file mode 100644
index f5350a0..0000000
--- a/fedora-updates-modular.repo
+++ /dev/null
@@ -1,36 +0,0 @@
-[updates-modular]
-name=Fedora Modular $releasever - $basearch - Updates
-#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/$basearch/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-f$releasever&arch=$basearch
-enabled=AUTO_VALUE
-countme=1
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[updates-modular-debuginfo]
-name=Fedora Modular $releasever - $basearch - Updates - Debug
-#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/$basearch/debug/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-debug-f$releasever&arch=$basearch
-enabled=0
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[updates-modular-source]
-name=Fedora Modular $releasever - Updates Source
-#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/SRPMS/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-source-f$releasever&arch=$basearch
-enabled=0
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
diff --git a/fedora-updates-testing-modular.repo b/fedora-updates-testing-modular.repo
deleted file mode 100644
index 3b9bfca..0000000
--- a/fedora-updates-testing-modular.repo
+++ /dev/null
@@ -1,36 +0,0 @@
-[updates-testing-modular]
-name=Fedora Modular $releasever - $basearch - Test Updates
-#baseurl=http://download.example/pub/fedora/linux/updates/testing/$releasever/Modular/$basearch/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-f$releasever&arch=$basearch
-enabled=AUTO_VALUE
-countme=1
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[updates-testing-modular-debuginfo]
-name=Fedora Modular $releasever - $basearch - Test Updates Debug
-#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/$basearch/debug/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-debug-f$releasever&arch=$basearch
-enabled=0
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[updates-testing-modular-source]
-name=Fedora Modular $releasever - Test Updates Source
-#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/SRPMS/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-source-f$releasever&arch=$basearch
-enabled=0
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False

From f484cf0e39b5d4f849a0421604df6df408a5d412 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Fri, 21 Jul 2023 16:47:53 +0100
Subject: [PATCH 091/108] Update IMA keys location for kernel/dracut

Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
---
 fedora-repos.spec | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index 4ee194a..0075850 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -4,7 +4,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        39
-Release:        0.3%{?eln:.eln%{eln}}
+Release:        0.4%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -119,6 +119,7 @@ stable in Bodhi and been available in the Fedora updates repo in the past.
 
 %package -n fedora-gpg-keys
 Summary:        Fedora RPM keys
+Requires:       filesystem >= 3.18-6
 
 %description -n fedora-gpg-keys
 This package provides the RPM signature keys.
@@ -177,8 +178,7 @@ ln -s RPM-GPG-KEY-fedora-%{version}-primary RPM-GPG-KEY-%{version}-fedora
 popd
 
 # Install the ima keys
-install -d -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-ima
-install -m 644 %{_sourcedir}/fedora*ima.* $RPM_BUILD_ROOT/etc/pki/rpm-ima/
+install -m 644 %{_sourcedir}/fedora*ima.* $RPM_BUILD_ROOT/etc/keys/ima/
 
 # Install repo files
 install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
@@ -379,7 +379,7 @@ rm -f "$TMPRING"
 %files -n fedora-gpg-keys
 %dir /etc/pki/rpm-gpg
 /etc/pki/rpm-gpg/RPM-GPG-KEY-*
-/etc/pki/rpm-ima/fedora*ima*
+/etc/keys/ima/fedora*ima*
 
 
 %files ostree
@@ -392,6 +392,9 @@ rm -f "$TMPRING"
 
 
 %changelog
+* Fri Jul 21 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 39-0.4
+- Update IMA keys location for kernel/dracut
+
 * Mon Jul 10 2023 Miro Hrončok <mhroncok@redhat.com> - 39-0.3
 - Drop fedora-repos-modular and fedora-repos-rawhide-modular packages
 - https://fedoraproject.org/wiki/Changes/RetireModularity

From df643a05c576d3b381bc091bbbc6f60db59a65c1 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Sun, 23 Jul 2023 21:37:07 +0100
Subject: [PATCH 092/108] create IMA directory even though it should be there

Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
---
 fedora-repos.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index 0075850..9f294ce 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -178,6 +178,7 @@ ln -s RPM-GPG-KEY-fedora-%{version}-primary RPM-GPG-KEY-%{version}-fedora
 popd
 
 # Install the ima keys
+install -d -m 755 $RPM_BUILD_ROOT/etc/keys/ima
 install -m 644 %{_sourcedir}/fedora*ima.* $RPM_BUILD_ROOT/etc/keys/ima/
 
 # Install repo files

From c910586362f233ac874c6a2fadb77ecacff9c73f Mon Sep 17 00:00:00 2001
From: Samyak Jain <samyak.jn11@gmail.com>
Date: Tue, 8 Aug 2023 11:05:02 +0530
Subject: [PATCH 093/108] Rawhide is now f40

Signed-off-by: Samyak Jain <samyak.jn11@gmail.com>
---
 fedora-repos.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index 9f294ce..3b24e6b 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,10 +1,10 @@
-%global rawhide_release 39
+%global rawhide_release 40
 %global updates_testing_enabled 0
 
 Summary:        Fedora package repositories
 Name:           fedora-repos
-Version:        39
-Release:        0.4%{?eln:.eln%{eln}}
+Version:        40
+Release:        0.1%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -393,6 +393,9 @@ rm -f "$TMPRING"
 
 
 %changelog
+* Tue Aug 08 2023 Samyak Jain <samyak.jn11@gmail.com> - 40-0.1
+- Setup for rawhide being F40
+
 * Fri Jul 21 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 39-0.4
 - Update IMA keys location for kernel/dracut
 

From 53f6d1a7bd0b89ad7bccd95e8b4d52b5774e7420 Mon Sep 17 00:00:00 2001
From: Samyak Jain <samyak.jn11@gmail.com>
Date: Tue, 8 Aug 2023 22:04:46 +0530
Subject: [PATCH 094/108] Add fedora 41 key

Signed-off-by: Samyak Jain <samyak.jn11@gmail.com>
---
 RPM-GPG-KEY-fedora-41-primary | 29 +++++++++++++++++++++++++++++
 archmap                       |  2 ++
 fedora-repos.spec             |  2 ++
 3 files changed, 33 insertions(+)
 create mode 100644 RPM-GPG-KEY-fedora-41-primary

diff --git a/RPM-GPG-KEY-fedora-41-primary b/RPM-GPG-KEY-fedora-41-primary
new file mode 100644
index 0000000..30afc1a
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-41-primary
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGTSYSwBEACTHP7OFONk+1B1awJeYToUFMVbYZIjNvj9M7zwf5vzH52FlpXX
+dsbs1AWh6NUe0zV1J5JjCGiI24Vjacysg7L2zsbgT48vVv3mXrXorjYOzT/cxsAh
+7PNhEx+OevKzAx3oy0Ok27c11Dz0W4ynwVy80gB6XHI2rd04v74TiC0xQYlxj1Sh
+j6irdLmHMD/NtTCWmCM7MRf91UcC4rk6JOap715UKey2fk1h/wylv0guMP3o+CpG
+jxDHENkfl/GsWCSYBaHec7o5/qg5RoAkN5NImVI00CqiEO1WHPBaCJalgwbuQCiW
+006jwVDHJHRoufS85PEKaY9yqd5Fr76kdqCLsf3Ys9yxGVfOTvCaKOa+ElWBo+i6
+yOtEO6Qp1Qd5spomBJ+FVPjU89lR9aDnvxIVX7X6zu638qV0K3Lb2HKmqiVG6ccJ
+IdxNVXJAekvu7ypwvRzEc0mGgfkZ47flaj7X8SxiebbXhYWdqRBF0rMYc7ppkbCp
+5NsD+KJilkfeOGb7VK6Rx5vXmySiNCb9GqN51KRl4Z1qllrc/Q1k5CCMt3AUq0hv
+1fwK3eFGtd4/YgF9LoZ0tW8WFZ6h/zWnRvJ/SDBPhtovoSpxptCd18MWiakwvwW0
+sxueKFlctdDjW1a/gri3V4RdTOZbr0AqDjGGcYndt/oxMeLxaK9qvs2xIQARAQAB
+tDFGZWRvcmEgKDQxKSA8ZmVkb3JhLTQxLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
+cmc+iQJOBBMBCAA4FiEERmzy2LYLwwV6qUU+0GIkYumdatEFAmTSYSwCGw8FCwkI
+BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ0GIkYumdatFHIQ//bTSVGDvJGmUxgHJw
+MnGM2G6Rc9PNAKuXbh6t4qsrRKp22pWNnMmqqcGaoiBxKP989a2cJgIVP49SsC4C
+ewaafEYhsitUtKagx6z3F7UObnvQpOz5U5iFcJCvRDtC4FXq+VkMdhT09zMZY4Ey
+ia29bV1B1R7pe7yXh6l3WyVj9AAXUSEBR/OsakaYEMzScLnROBEU1YbWR9iHsc7M
+rEsqju8tVUh1XAqIqJgLW3VrKs0g0nDVR0rBc8aDhrtVfylwWVl61gHsPFJfAkjj
+OPgvQgThrhlCWo23EZSk/Hj8YRrnhUbEDnk+Z3Xv5Uyl1kxGRk5dGBnv+7u3CKvV
+G6sU3tPtna/8rFblfKSMZIPhzTADdsUZ88Fn9pZkfqgPi8LZ4sS8vHtaykZmbfj6
+t9a2mBYJQ+/pxiH8olzyhKMdNyesLPeQmESgwM/qlJ+b2Hbogwuuzp8o2JMezxIe
+CAwLoPh+hxMPGnBRklh6Vj5R5z29wIZd6pKCavVRfJ+ON94wuOSEofhBfQNZIIFV
+jagEbk60iksysxsObfVEHFhtGnZCEgCRC87BfX6tzIIDv23Zs4Bv9gcaaRXTAml2
+kZXktduHkV9q3hhcoha5FgGSe244C4GsMUkWCsZtuN6tevUPo+n2ZZAA7ikQ768r
+Iz9rPOI8/Ra7qnwSlNIVnkTb9bc=
+=e2ew
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/archmap b/archmap
index ccfa584..02b1a72 100644
--- a/archmap
+++ b/archmap
@@ -87,3 +87,5 @@ fedora-38-primary: x86_64 aarch64 ppc64le s390x
 fedora-39-primary: x86_64 aarch64 ppc64le s390x
 
 fedora-40-primary: x86_64 aarch64 ppc64le s390x
+
+fedora-41-primary: x86_64 aarch64 ppc64le s390x
\ No newline at end of file
diff --git a/fedora-repos.spec b/fedora-repos.spec
index 3b24e6b..8b13d03 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -80,6 +80,8 @@ Source57:       RPM-GPG-KEY-fedora-37-primary
 Source58:       RPM-GPG-KEY-fedora-38-primary
 Source59:       RPM-GPG-KEY-fedora-39-primary
 Source60:       RPM-GPG-KEY-fedora-40-primary
+Source61:       RPM-GPG-KEY-fedora-41-primary
+
 # When bumping Rawhide to fN, create N+1 key (and update archmap). (This
 # ensures users have the next future key installed and referenced, even if they
 # don't update very often. This will smooth out Rawhide N->N+1 transition for them).

From 99301fd94d5595a63e2920de90e8e98abd457468 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Tue, 15 Aug 2023 15:07:16 -0400
Subject: [PATCH 095/108] Add definition for the OpenH264 source repository

---
 fedora-cisco-openh264.repo | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/fedora-cisco-openh264.repo b/fedora-cisco-openh264.repo
index 02150d9..e65c565 100644
--- a/fedora-cisco-openh264.repo
+++ b/fedora-cisco-openh264.repo
@@ -20,3 +20,13 @@ gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 skip_if_unavailable=True
 
+[fedora-cisco-openh264-source]
+name=Fedora $releasever openh264 (From Cisco) - $basearch - Source
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-cisco-openh264-source-$releasever&arch=$basearch
+type=rpm
+enabled=0
+metadata_expire=14d
+repo_gpgcheck=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=True

From 4c67fac3aa8f7f9f8712297a2612cef1b9bed06e Mon Sep 17 00:00:00 2001
From: Sandro Bonazzola <sbonazzo@redhat.com>
Date: Wed, 27 Sep 2023 12:05:18 +0200
Subject: [PATCH 096/108] Allow to install ELN without Rawhide repos

Signed-off-by: Sandro Bonazzola <sbonazzo@redhat.com>
---
 fedora-repos.spec | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index 8b13d03..b8e5341 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -4,7 +4,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        40
-Release:        0.1%{?eln:.eln%{eln}}
+Release:        0.2%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -136,7 +136,9 @@ where client's system will pull OSTree updates.
 
 
 %package eln
-Summary: ELN repo definitions
+Summary:        ELN repo definitions
+Requires:       fedora-gpg-keys >= %{version}-%{release}
+Requires:       system-release(%{version})
 
 %description eln
 This package provides repository files for ELN (Enterprise Linux Next)
@@ -395,6 +397,9 @@ rm -f "$TMPRING"
 
 
 %changelog
+* Wed Sep 27 2023 Sandro Bonazzola <sbonazzo@redhat.com> - 40-0.2
+- Allow ELN installation without Rawhide repos
+
 * Tue Aug 08 2023 Samyak Jain <samyak.jn11@gmail.com> - 40-0.1
 - Setup for rawhide being F40
 

From fa181f3426341fa8d303e496094a95ab925b7ec7 Mon Sep 17 00:00:00 2001
From: Samyak Jain <samyak.jn11@gmail.com>
Date: Tue, 13 Feb 2024 02:14:38 +0530
Subject: [PATCH 097/108] Rawhide is now f41

Signed-off-by: Samyak Jain <samyak.jn11@gmail.com>
---
 fedora-repos.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index b8e5341..70d54ad 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,10 +1,10 @@
-%global rawhide_release 40
+%global rawhide_release 41
 %global updates_testing_enabled 0
 
 Summary:        Fedora package repositories
 Name:           fedora-repos
-Version:        40
-Release:        0.2%{?eln:.eln%{eln}}
+Version:        41
+Release:        0.1%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -397,6 +397,9 @@ rm -f "$TMPRING"
 
 
 %changelog
+* Tue Feb 13 2024 Samyak Jain <samyak.jn11@gmail.com> - 41-0.1
+- Setup for rawhide being F41
+
 * Wed Sep 27 2023 Sandro Bonazzola <sbonazzo@redhat.com> - 40-0.2
 - Allow ELN installation without Rawhide repos
 

From d10a092adbcf0e0b2d7e4f05311255c805c878b5 Mon Sep 17 00:00:00 2001
From: Samyak Jain <samyak.jn11@gmail.com>
Date: Tue, 13 Feb 2024 02:20:12 +0530
Subject: [PATCH 098/108] Add fedora 42 key

Signed-off-by: Samyak Jain <samyak.jn11@gmail.com>
---
 RPM-GPG-KEY-fedora-42-primary | 29 +++++++++++++++++++++++++++++
 archmap                       |  4 +++-
 fedora-repos.spec             |  1 +
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 RPM-GPG-KEY-fedora-42-primary

diff --git a/RPM-GPG-KEY-fedora-42-primary b/RPM-GPG-KEY-fedora-42-primary
new file mode 100644
index 0000000..c8da319
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-42-primary
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGXKg9EBEACvsAjRcllcH6mVReU/0hi5YnwqulP7gNgUM4jYPiqucF51g0oW
+MbFk0VjDn3QXjrwLNLtj4oxsU+E6OW0jl1732qvjUJ9geEZBuidyFZgq0CCn9K8d
+661dPDjN/DzWWogFhnDySFHRLdh6dYCuu75/HKSIVfCud2IFCvT7Bhk4AOpxv4c7
+mmX874LFgi49jkAYC0M6UbJ9o3KSCndipf/k0ra2g9dGacqlPfn3PMiTszPDr99d
+o4qZ5dVZYC6Sna8GjNhN7b/2xLGQuzdd9LHgPHC/PX7XsvBLu42rqi3q0umJBtjZ
+CyFxF5Dp0VMwmVfrKFZOHvVsGjPLrxomLU16/EDzIrw6cHikdQKLf4sl0rX0m8j0
+PNAGOSDmE9YgByiPo12CGMOuAvsDUI0JID4p4WqpBShTBuiIrITn8XVTCOQ+tKq9
+dE/qI+mm2hnZjJajM2UWfKE0mVH4SDOiSilgKR/h5HuLZqwtYXFExDZsAcxaLfRB
+KCrIOyJdpV7YIj8PaP89XeycHM2MaIfwdHSx3Pz39zZNzi6vJkLj9SWdQT7lOvZx
+xTQ3dK0Rcpjx+rGHgihMT4yBd+JO9mZS3ghNGbypYnNn/mohPOAxguXuPuPRj00o
+C7C3lIEEL/hZXZbN1SuiopZjxbU/x/5lO8n0Un1GCzynObPDvpDLTjsdKQARAQAB
+tDFGZWRvcmEgKDQyKSA8ZmVkb3JhLTQyLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
+cmc+iQJOBBMBCAA4FiEEsPSVBFj2nhFQxsXtyKxJFhBe+UQFAmXKg9ECGw8FCwkI
+BwIGFQoJCAsCBBYCAwECHgECF4AACgkQyKxJFhBe+US4mQ//e4gIGhA6TJuEqrVP
+gKtSnDawIj30TGbkXIywECtKCu9N8anTlkU2/XSKGyE3ZDdKDO77O11382Ci1xJg
+CpdbqKg4G02ecEKT1Dtng37gt55SkhffQ0EeDb3Zl+Pu5qohHQUiMzio4B4q8n0H
+D+L9klQ3I1rLmymguBRd34jQH/z025GE2SBbCpDnQCChZT7Fq1D/onOQgC6skN6Q
+E2dvYqOnSlHkkfuVlRRYoLNmynxHKlL6VZkiM7m1zKi7cMEK63mKJQ3jH3Mc9grh
++OwBDxOjx5UoYMeYqq7oXyTPKvvf6ssuHtjWM3tNkyi5R1nB+4SHMttrbt2pLMSH
+Jg6pNXoLAP8ahlvxdgVRjgN/6OMC/DwXnLxippelBXXDyBnwVd8/WohbJDcq7e5t
+dymZpRsNxzhWSuwbHzeJY1DKtePhbjblShLjxTzLnS4GBPJV5TXpHkZWgQmz2aA0
+CHV47j37P6kAOEtsJkJUWWz+/Rx1N5Mm5lxvghaAzlTBtwQhRgl9Y8kCTznG40QQ
+64N2FOrcExUJmujLRISDjM2Ps9MtBlbYs7H4JDziX4jpNyvhVAbEdjbzVfL5oi35
+l+K/QRtQJnt78qhLpNNB7SdQkNmD8eMeXF7mA/MH6eFM88hF4l6NeKklyMIa5thg
+LFx0UyEgoLXDBg+thUzby61gnA8=
+=OCXB
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/archmap b/archmap
index 02b1a72..60abb09 100644
--- a/archmap
+++ b/archmap
@@ -88,4 +88,6 @@ fedora-39-primary: x86_64 aarch64 ppc64le s390x
 
 fedora-40-primary: x86_64 aarch64 ppc64le s390x
 
-fedora-41-primary: x86_64 aarch64 ppc64le s390x
\ No newline at end of file
+fedora-41-primary: x86_64 aarch64 ppc64le s390x
+
+fedora-42-primary: x86_64 aarch64 ppc64le s390x
diff --git a/fedora-repos.spec b/fedora-repos.spec
index 70d54ad..669cb28 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -81,6 +81,7 @@ Source58:       RPM-GPG-KEY-fedora-38-primary
 Source59:       RPM-GPG-KEY-fedora-39-primary
 Source60:       RPM-GPG-KEY-fedora-40-primary
 Source61:       RPM-GPG-KEY-fedora-41-primary
+Source62:       RPM-GPG-KEY-fedora-42-primary
 
 # When bumping Rawhide to fN, create N+1 key (and update archmap). (This
 # ensures users have the next future key installed and referenced, even if they

From 75550b9fdae227e98652c037d84e0067cf0fa16c Mon Sep 17 00:00:00 2001
From: Coiby Xu <coxu@redhat.com>
Date: Tue, 7 May 2024 16:46:02 +0800
Subject: [PATCH 099/108] Add IMA certs

Add Fedora IMA certs,
 - The code-signing keys /etc/keys/ima/* are supposed to be read by the
   dracut integrity module and other user space tools
 - The CA key /usr/share/ima/ca.der is supposed to be built into the
   kernel

Note the dracut integrity module only reads a DER cert and will error if
given other formats,
    Failed to d2i_X509_fp key file: /sysroot/etc/keys/ima/fedora-39-ima.pem
    openssl: error:068000A8:asn1 encoding routines::wrong tag
    openssl: error:0688010A:asn1 encoding routines::nested asn1 error

Signed-off-by: Coiby Xu <coxu@redhat.com>
---
 fedora-39-ima.der | Bin 426 -> 446 bytes
 fedora-40-ima.der | Bin 0 -> 445 bytes
 fedora-41-ima.der | Bin 0 -> 444 bytes
 fedora-42-ima.der | Bin 0 -> 444 bytes
 fedora-ima-ca.der | Bin 0 -> 408 bytes
 fedora-repos.spec |  28 +++++++++++++++++-----------
 6 files changed, 17 insertions(+), 11 deletions(-)
 create mode 100644 fedora-40-ima.der
 create mode 100644 fedora-41-ima.der
 create mode 100644 fedora-42-ima.der
 create mode 100644 fedora-ima-ca.der

diff --git a/fedora-39-ima.der b/fedora-39-ima.der
index 0d13baa62d75c2fc8404a539c9e554a8a3dc33ec..7396f87bf84946d5eeae16ae352994061d69ee3c 100644
GIT binary patch
delta 365
zcmZ3*ypOrwpowvpK@(&A0%j&gCMFS){Gj@84}ADcHYZJ+F7hx<T)ZaFfQyYotIgw_
zEekV?frO!$fe0IOC<`+WuUl$Leo>-=r>~=ev!j8WIIoe3fvJI+k)e@^k#UqbuaOxN
z*Feiq!$1w9Qy!|**isClJ3l2=w>UFBFEcM)Avv|EWMXAZeW^jQfiN3$sH`dr56B7H
zY>cd|?99vtJRm_~M#ldvOa=@Fd>|e_h{wXr#NJ>a3*z&!h_Q%>2Bj@o{Hpryop}~_
zH%>Zq$)Y>K&Oja{t;`}}Al4wVVgZj~ntiMNocvE=9z~BU)-z>mz&-27!py?#$zb5d
zq{whZ^AK0o6j|N;j}Mofow%;N{LwDCZ)=NZE-&F!?Cw6M%cRIK=WB`ur~k9l-&DG?
aGTa_9|Gcqab^TPyi4*t5vp%0LeFFgG)@$eh

delta 350
zcmdnTyo$NrpowvrK@+3S0%j&gCMHHL11>fWtu~Kywk*ud2GWL-2I6eYp)Ab80&b}(
z`9+Be#+C}6zK#mcjs^<iyhg?bMurxK76vAUW>FISMh2$H0tPaMQU($b?SiP<y;Ca<
zA`OJu*eA{otB*5?G2mfi4wV&VWc<&<WWZn`58^4aNEnDUh%6VeJDqaj$f?hBd1{YX
zxVqg4{vTwZ&BmF~=E2zZ!-<iXMGoYk;>`5C#FEmYRE4tCqRh0+<iwK9{5*y1)JkL@
zF=sFsq%s*YY;riCr#QRmo&ELJiZGrgi51t%RvlE}C=)#QBxojs-s<})Wr_B`7Pc)g
z)Nt;5^>0@ilR?6>)1{fyeUi&mQoNHFZ7B58TwB1xX~q_R@v+qEZ~ymXZ{OkM&9!(*
N*SD{w=ejf30|2u@Z(;xd

diff --git a/fedora-40-ima.der b/fedora-40-ima.der
new file mode 100644
index 0000000000000000000000000000000000000000..ae6c11151d6c0f929898ebb9011e786f16de3e38
GIT binary patch
literal 445
zcmXqLV%%xa#2CMTnTe5!NyNl5G5kZ4&awaVyo*XYyrb_hzHB$(V&l+i^EhYA!pveI
zVJK!G!p0oR!py_#mYR}Zl&Ik8>!{%DXdoxfYh+?zYG7t$Xk=_^6eZ4UWQN2w&@$98
zP=n}{hw3yjfN0K7N!2aROwY^AOIJuvEh;gHG!SNE2iwWS2(_G<k)7Fzf#p=@!>M8I
zy7_bc5BTR8^`E^pS@p@v7Aco42KQ>0J4ZTg+pu{_m*werhR)pOdbW>Vi#oqr_Ibq{
z27@o^@tr|s5{pX>iVcL>m_ub%S$IG`(`I92Wo2h(HsApX3NtePXJIm6FyI66_(41t
zW+wIq16dHCk420{MECuohgUUj8}!=AENUuQ<*-=6Yo38TNLrai!a%G+WW@p=!!-L=
z`#Jfa!aRx|SFC5s)<6zJW)B7fS0+V<+5Ar*3(u{y{BpnDSMjE$^|?RI$&0l&RzCgi
uQnYHtoyklJ(mPF`@ZFbLv(P5IrsIp+e%)oOd)IDXlGmhUvZHeLs{a7}B91!%

literal 0
HcmV?d00001

diff --git a/fedora-41-ima.der b/fedora-41-ima.der
new file mode 100644
index 0000000000000000000000000000000000000000..4f8787e4ea6f8a5ecbcde1c14bf9376078c26cea
GIT binary patch
literal 444
zcmXqLV%%ZS#2CMTnTe5!Nkm+^p#SUFvNwyQ>hcz>l3{jjn$vE;#m1r4=5fxJg_*@b
z!cfdWgpE0rg_(!fEj1;-C{e-F*HOXQ(Lhd|*T}@c)WFQh(8$=(G)kP;$P9^Vpk=6G
zpa#(?57lX62+^FMlB!#rnVy%Km#&bUT2x{XX&}tT4z`nt5o$RzBRjJb1Isd#De>lK
zF9r6zUZ0V1;lkw4?vWfE^UIm~MB7epJbQKPM&m>8X4igP@`=~d_U9^tLmM5E#9e#V
zZm(8&zv!I0+=RuY2E_)#Y|Npusw_MppJ}r(va+%>GaK-L1cezH|FbX|Fc|QGc>Ew9
z3o{dYgMloF&&MLhA|l%TerNxockCR-7Z)u_%Y5FRTViS;50X}9kuVTz5LvN+$1u&l
z)qYO?r!bGA#}(_DvNe#yklCHVz=cV{K=rJ7_f-j__0jtyzJAi3;_+>2udnSzr+T%`
uQ=B`+Q<xNLPygy$`1-^26+0%Y$onvI&*qt?UDR>@fAAz@nU!1q3IYI}Z;bu`

literal 0
HcmV?d00001

diff --git a/fedora-42-ima.der b/fedora-42-ima.der
new file mode 100644
index 0000000000000000000000000000000000000000..11b8cd8936bb03d2130e610856260694aacf2aa7
GIT binary patch
literal 444
zcmXqLV%%ZS#2CMTnTe5!NknR9<AScJZ)$=YPcD+mVSN9%_w!-{E;bIWHji_*EX*th
z5{6<1B5cf|EX+K-ZmB8xMTrWYzK#mcjs|k#yhbJlrUqt4hDJt4W>Mn2MrKG{11&=h
z12u?Fd8kekBZ%hwlvLf~%=Em>ymW=+)S?oDNCROucCejHj8My&8QGbg7+6}i3-}3j
zFtuBBDJ(Dv3;$-PK0iw8*w;gKd-t~8+!OX)&D!Bx!e2Y4t`C0h4o|un!+*zy*5!Gr
zIz-BC)CkBwvbfZs*g%+#IaF4ag$Lv_Z8k<$R(57)10Il|FeBrC7A6A*13nOsAH-u}
zW@2wJkOlGiSj1RF7A`$<;wEdzgL5(LCm*VRVov&?wZuRkB(2OMVIbBZvSI;`VVZrb
z{ha(yVID<~E7mh*YaoXqvpa)<3zLGed~xLFbzcHL|NE(EzkBn{tl7;k_O|3r5&WyP
s*S6jxlSx5Vs9RmB&%FKj?3?$E{Vy8jUSC?>)3tEfpHNA@Z5AOn0clc;V*mgE

literal 0
HcmV?d00001

diff --git a/fedora-ima-ca.der b/fedora-ima-ca.der
new file mode 100644
index 0000000000000000000000000000000000000000..f75acb694daa9b9e359963ac42ce1ce1bc9771c7
GIT binary patch
literal 408
zcmXqLVw_^o#Av;MnTe5!NyKdGOR?^<`@hpXC44trXPUW1*(ltAi;Y98&EuRc3p0y>
zgrS&$2pe-K3o{R|TWU&vQKEvUucLyqqk)__uaSv?sezf1p`nF|S(G@hF^Fpd<>Jv9
zX&}tT4z_`b5o#4PBRjJb1B?1Zk$<<}$4qLUEEazC`;h|gx$5WqtQ_KgTx;Nu(D`JS
zp8w~u$SkQhCtj#){$^&*34f(`djGvQP1UZ`Uw8iBC%HJ;Akl!IjX6|Sn33^63#$P$
zBjbMqK9B%ENPvZziIL4f7R2Xc5n~Zqv4F=g&A!!sPX4DbkD|vF>zT4O4CF!5$}AEF
zVhz|8AcYUJJA;7>lY;dA4=wScmp+|#R$a&cR^~`rXK%ol*@=%Y$<JtZxyxw5q#((*
jW}VrRAHlBrmTv<kEMDkEm1=xtcB<g}-6?DybEy^p22X*I

literal 0
HcmV?d00001

diff --git a/fedora-repos.spec b/fedora-repos.spec
index 669cb28..b02dffd 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -4,7 +4,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        41
-Release:        0.1%{?eln:.eln%{eln}}
+Release:        0.2%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -91,13 +91,12 @@ Source150:      RPM-GPG-KEY-fedora-iot-2019
 Source151:      fedora.conf
 Source152:      fedora-compose.conf
 
-# ima certs
-Source500:      fedora-38-ima.cert
-Source501:      fedora-38-ima.der
-Source502:      fedora-38-ima.pem
-Source503:      fedora-39-ima.cert
-Source504:      fedora-39-ima.der
-Source505:      fedora-39-ima.pem
+# IMA certs: dracut integrity module only recognizes DER format
+Source500:      fedora-ima-ca.der
+Source501:      fedora-39-ima.der
+Source502:      fedora-40-ima.der
+Source503:      fedora-41-ima.der
+Source504:      fedora-42-ima.der
 
 %description
 Fedora package repository files for yum and dnf along with gpg public keys.
@@ -127,7 +126,6 @@ Requires:       filesystem >= 3.18-6
 %description -n fedora-gpg-keys
 This package provides the RPM signature keys.
 
-
 %package ostree
 Summary:        OSTree specific files
 
@@ -182,9 +180,11 @@ done
 ln -s RPM-GPG-KEY-fedora-%{version}-primary RPM-GPG-KEY-%{version}-fedora
 popd
 
-# Install the ima keys
+# Install the IMA certs
 install -d -m 755 $RPM_BUILD_ROOT/etc/keys/ima
-install -m 644 %{_sourcedir}/fedora*ima.* $RPM_BUILD_ROOT/etc/keys/ima/
+install -m 644 %{_sourcedir}/fedora*ima.der $RPM_BUILD_ROOT/etc/keys/ima/
+install -d -m 755 $RPM_BUILD_ROOT/usr/share/ima/
+install -m 644 %{_sourcedir}/fedora-ima-ca.der $RPM_BUILD_ROOT/usr/share/ima/ca.der
 
 # Install repo files
 install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
@@ -385,7 +385,10 @@ rm -f "$TMPRING"
 %files -n fedora-gpg-keys
 %dir /etc/pki/rpm-gpg
 /etc/pki/rpm-gpg/RPM-GPG-KEY-*
+
+# ima-certs
 /etc/keys/ima/fedora*ima*
+/usr/share/ima/ca.der
 
 
 %files ostree
@@ -398,6 +401,9 @@ rm -f "$TMPRING"
 
 
 %changelog
+* Wed May 08 2024 Coiby Xu <coxu@redhat.com> - 41-0.2
+- add/update IMA certs
+
 * Tue Feb 13 2024 Samyak Jain <samyak.jn11@gmail.com> - 41-0.1
 - Setup for rawhide being F41
 

From f645199628cd52bd8723f854780880b57af8bb68 Mon Sep 17 00:00:00 2001
From: Samyak Jain <samyak.jn11@gmail.com>
Date: Sat, 10 Aug 2024 18:38:01 +0530
Subject: [PATCH 100/108] Add Fedora 43 key

Signed-off-by: Samyak Jain <samyak.jn11@gmail.com>
---
 RPM-GPG-KEY-fedora-43-primary | 29 +++++++++++++++++++++++++++++
 archmap                       |  2 ++
 fedora-repos.spec             |  6 +++++-
 3 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 RPM-GPG-KEY-fedora-43-primary

diff --git a/RPM-GPG-KEY-fedora-43-primary b/RPM-GPG-KEY-fedora-43-primary
new file mode 100644
index 0000000..7be8eef
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-43-primary
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGa23M8BEAC47NwKLi/g2S9I2p5JtUbJ0y3m2St9zqkSENmYw/+R+WKvaP3S
+KSFQF3Qi6pqGXJ88ADJUkFYpOGGyoc0dieLCmIPqtWbwGvBVMxBRBeU3+hClwbSQ
+sysVnr8VxUwidfsIjNJavCZwB0ZoZbxdCPMQMOgQyTLX4OI/uKlPUzeymDHwxjb/
+tllflSTOGtdYe3giRzidxN+xbCb6UoXkl0+lJEFbsmp41O5D/Ur5N05lBrsEXoDu
+Fr99Kfv3Av7f3JfzDlkqC/EhmfxZEZvWj3hRdAfi2fFmtVcrdLfGIpQg6Y2Baphp
+PhaHqKl9zD5GWqu5GSXGoLaGXusBvwBKjS/g+VLo7pJfMsUF3sUduJNG3UThAsrp
+QLV3wQz0AMHVElRErOWdBDY0ddAKLPL7/mtxj39pGEpZ/dNtQkzgm7VCdP10QnQZ
+rwR2l8k7CPu0pylPCXmXvKFWV1uv9RnztlWY6BRmufKn+lJsN3Blh7ndi5rlCjR6
+mHVrQD/l6+8VmSD3/mDnbEXPyzBkSY5D1wpR7M5VXN5jVHROc4ZA5M88SyI48ESG
+NmeAwtGar45/X+wG47+EC4+JXpNO7BQrEvHgJxBdyoQ6KLDrEaqn/OQpxB4Gfmcv
+SwkWDpSk8wFm/pGlFK6J4b+ba7eOetW+aXrWSiFB1sTAg0OY+gds67OpWQARAQAB
+tDFGZWRvcmEgKDQzKSA8ZmVkb3JhLTQzLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
+cmc+iQJSBBMBCAA8FiEExufwgc+A4TFGZ26IgptgZjFkVTEFAma23M8CGw8FCwkI
+BwIDIgIBBhUKCQgLAgQWAgMBAh4HAheAAAoJEIKbYGYxZFUxagQP/RYWw5j0Gfvv
+lWkDQTjTVAnHtbKuQLYM13Lx5d3W1k0g6Xdrolf4yPjh4YPYVQDXksB4i6ULLbMo
+8u46UCPMQwCXTd3Ax9imYn+V74Isl/CkBbKQD9YfSJjhW3mSlPa27jo2uhqpdV0S
+xp05NWYnWrZN+GbtCUs1+rNTBevagOURtlZ8f0iPVRA/PxWzpjbRaGrCHlIYc3JO
+GKLUuQueLvOUg2pP8dtpll7S3xUe5Abyq2ifT34T0wHi6hJA3bfpXo1uNXRvGrNw
+gbJ7V6P7ioTcvyhS1h4zjelKFyvTnOKOy5D08HKmvTMWZQWEL7kDNymh1jMV7Abg
+4TPp808EiPF1GGAzXU56feaURSvIuix3MkjhGZsSQQH2kkkEIzq6j/EwmpyEMW38
+dtql4T2bVS/cTk/hRaqUKZlyrsL657g/4mFA1wDDM3895fYkHOpYF4JZ9SeDrhuc
+TgpC7/TW55l6vSiFtnQvcMfjpfCA6mCA4b75k+/xG9RxxBnYU0qVuUo/8pON31yQ
+D2AM2v7WbJBYVRYLlqPrkAZU5fe7+2wY7P7N0IAPwVA0TFJ1x6as3Kezdi/304mg
+oC98DBLjHaUpX2bTxKMtCzlmeqPiwtyNkA9O9IQO7qQzArBKxmAgof4wblN5SL8i
+fsjiJUqsK/gTYwJ744I/tzxOy5FXjA7z
+=Bqds
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/archmap b/archmap
index 60abb09..9132863 100644
--- a/archmap
+++ b/archmap
@@ -91,3 +91,5 @@ fedora-40-primary: x86_64 aarch64 ppc64le s390x
 fedora-41-primary: x86_64 aarch64 ppc64le s390x
 
 fedora-42-primary: x86_64 aarch64 ppc64le s390x
+
+fedora-43-primary: x86_64 aarch64 ppc64le s390x
diff --git a/fedora-repos.spec b/fedora-repos.spec
index b02dffd..ee402ae 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -4,7 +4,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        41
-Release:        0.2%{?eln:.eln%{eln}}
+Release:        0.3%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -82,6 +82,7 @@ Source59:       RPM-GPG-KEY-fedora-39-primary
 Source60:       RPM-GPG-KEY-fedora-40-primary
 Source61:       RPM-GPG-KEY-fedora-41-primary
 Source62:       RPM-GPG-KEY-fedora-42-primary
+Source63:       RPM-GPG-KEY-fedora-43-primary
 
 # When bumping Rawhide to fN, create N+1 key (and update archmap). (This
 # ensures users have the next future key installed and referenced, even if they
@@ -401,6 +402,9 @@ rm -f "$TMPRING"
 
 
 %changelog
+* Sat Aug 10 2024 Samyak Jain <samyak.jn11@gmail.com> - 41-0.3
+- Add RPM-GPG-KEY-fedora-43-primary
+
 * Wed May 08 2024 Coiby Xu <coxu@redhat.com> - 41-0.2
 - add/update IMA certs
 

From bb7211a8fb0c2fc8b5c3478b45b4bd30bc8317d6 Mon Sep 17 00:00:00 2001
From: Samyak Jain <samyak.jn11@gmail.com>
Date: Sun, 11 Aug 2024 17:31:05 +0530
Subject: [PATCH 101/108] Rawhide is now f42

Signed-off-by: Samyak Jain <samyak.jn11@gmail.com>
---
 fedora-repos.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index ee402ae..cd4f420 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,10 +1,10 @@
-%global rawhide_release 41
+%global rawhide_release 42
 %global updates_testing_enabled 0
 
 Summary:        Fedora package repositories
 Name:           fedora-repos
-Version:        41
-Release:        0.3%{?eln:.eln%{eln}}
+Version:        42
+Release:        0.1%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -402,6 +402,9 @@ rm -f "$TMPRING"
 
 
 %changelog
+* Tue Aug 13 2024 Samyak Jain <samyak.jn11@gmail.com> - 42-0.1
+- Setup for rawhide being F42
+
 * Sat Aug 10 2024 Samyak Jain <samyak.jn11@gmail.com> - 41-0.3
 - Add RPM-GPG-KEY-fedora-43-primary
 

From afda15d92a2f1ada94cb55e74de1732523f2b45e Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Wed, 18 Sep 2024 13:58:39 -0400
Subject: [PATCH 102/108] Use mirror links for ELN repositories

MirrorManager support for ELN was added in
https://github.com/fedora-infra/mirrormanager2/issues/382

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
---
 fedora-eln.repo   | 120 +++++++++++++++++++++++-----------------------
 fedora-repos.spec |   5 +-
 2 files changed, 64 insertions(+), 61 deletions(-)

diff --git a/fedora-eln.repo b/fedora-eln.repo
index c2c1275..ffcde5f 100644
--- a/fedora-eln.repo
+++ b/fedora-eln.repo
@@ -21,8 +21,8 @@
 
 [eln-baseos]
 name=Fedora - ELN BaseOS - Developmental packages for the next Enterprise Linux release
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/BaseOS/$basearch/os/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
+#baseurl=https://download.example/pub/eln/1/BaseOS/$basearch/os/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-baseos-1&arch=$basearch
 enabled=AUTO_VALUE
 countme=1
 metadata_expire=6h
@@ -34,8 +34,8 @@ skip_if_unavailable=False
 
 [eln-baseos-debuginfo]
 name=Fedora - ELN BaseOS - Debug
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/BaseOS/$basearch/debug/tree
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
+#baseurl=https://download.example/pub/eln/1/BaseOS/$basearch/debug/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-baseos-debug-1&arch=$basearch
 enabled=0
 metadata_expire=6h
 repo_gpgcheck=0
@@ -46,8 +46,8 @@ skip_if_unavailable=False
 
 [eln-baseos-source]
 name=Fedora - ELN BaseOS - Source
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/BaseOS/source/tree/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
+#baseurl=https://download.example/pub/eln/1/BaseOS/source/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-baseos-source-1&arch=$basearch
 enabled=0
 metadata_expire=6h
 repo_gpgcheck=0
@@ -60,8 +60,8 @@ skip_if_unavailable=False
 
 [eln-appstream]
 name=Fedora - ELN AppStream - Developmental packages for the next Enterprise Linux release
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/AppStream/$basearch/os/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
+#baseurl=https://download.example/pub/eln/1/AppStream/$basearch/os/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-appstream-1&arch=$basearch
 enabled=AUTO_VALUE
 countme=1
 metadata_expire=6h
@@ -73,8 +73,8 @@ skip_if_unavailable=False
 
 [eln-appstream-debuginfo]
 name=Fedora - ELN AppStream - Debug
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/AppStream/$basearch/debug/tree
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
+#baseurl=https://download.example/pub/eln/1/AppStream/$basearch/debug/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-appstream-debug-1&arch=$basearch
 enabled=0
 metadata_expire=6h
 repo_gpgcheck=0
@@ -85,8 +85,8 @@ skip_if_unavailable=False
 
 [eln-appstream-source]
 name=Fedora - ELN AppStream - Source
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/AppStream/source/tree/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
+#baseurl=https://download.example/pub/eln/1/AppStream/source/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-appstream-source-1&arch=$basearch
 enabled=0
 metadata_expire=6h
 repo_gpgcheck=0
@@ -99,8 +99,8 @@ skip_if_unavailable=False
 
 [eln-crb]
 name=Fedora - ELN CRB - Developmental packages for the next Enterprise Linux release
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/CRB/$basearch/os/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
+#baseurl=https://download.example/pub/eln/1/CRB/$basearch/os/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-crb-1&arch=$basearch
 enabled=AUTO_VALUE
 countme=1
 metadata_expire=6h
@@ -112,8 +112,8 @@ skip_if_unavailable=False
 
 [eln-crb-debuginfo]
 name=Fedora - ELN CRB - Debug
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/CRB/$basearch/debug/tree
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
+#baseurl=https://download.example/pub/eln/1/CRB/$basearch/debug/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-crb-debug-1&arch=$basearch
 enabled=0
 metadata_expire=6h
 repo_gpgcheck=0
@@ -124,8 +124,8 @@ skip_if_unavailable=False
 
 [eln-crb-source]
 name=Fedora - ELN CRB - Source
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/CRB/source/tree/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
+#baseurl=https://download.example/pub/eln/1/CRB/source/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-crb-source-1&arch=$basearch
 enabled=0
 metadata_expire=6h
 repo_gpgcheck=0
@@ -138,8 +138,8 @@ skip_if_unavailable=False
 
 [eln-extras]
 name=Fedora - ELN Extras - Developmental packages for the next Enterprise Linux release
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Extras/$basearch/os/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
+#baseurl=https://download.example/pub/eln/1/Extras/$basearch/os/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-extras-1&arch=$basearch
 enabled=AUTO_VALUE
 countme=1
 metadata_expire=6h
@@ -151,8 +151,8 @@ skip_if_unavailable=False
 
 [eln-extras-debuginfo]
 name=Fedora - ELN Extras - Debug
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Extras/$basearch/debug/tree
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
+#baseurl=https://download.example/pub/eln/1/Extras/$basearch/debug/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-extras-debug-1&arch=$basearch
 enabled=0
 metadata_expire=6h
 repo_gpgcheck=0
@@ -163,8 +163,8 @@ skip_if_unavailable=False
 
 [eln-extras-source]
 name=Fedora - ELN Extras - Source
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Extras/source/tree/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
+#baseurl=https://download.example/pub/eln/1/Extras/source/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-extras-source-1&arch=$basearch
 enabled=0
 metadata_expire=6h
 repo_gpgcheck=0
@@ -177,8 +177,8 @@ skip_if_unavailable=False
 
 [eln-ha]
 name=Fedora - ELN HighAvailability - Developmental packages for the next Enterprise Linux release
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/HighAvailability/$basearch/os/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
+#baseurl=https://download.example/pub/eln/1/HighAvailability/$basearch/os/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-highavailability-1&arch=$basearch
 enabled=0
 countme=1
 metadata_expire=6h
@@ -190,8 +190,8 @@ skip_if_unavailable=False
 
 [eln-ha-debuginfo]
 name=Fedora - ELN HighAvailability - Debug
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/HighAvailability/$basearch/debug/tree
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
+#baseurl=https://download.example/pub/eln/1/HighAvailability/$basearch/debug/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-highavailability-debug-1&arch=$basearch
 enabled=0
 metadata_expire=6h
 repo_gpgcheck=0
@@ -202,8 +202,8 @@ skip_if_unavailable=False
 
 [eln-ha-source]
 name=Fedora - ELN HighAvailability - Source
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/HighAvailability/source/tree/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
+#baseurl=https://download.example/pub/eln/1/HighAvailability/source/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-highavailability-source-1&arch=$basearch
 enabled=0
 metadata_expire=6h
 repo_gpgcheck=0
@@ -216,8 +216,8 @@ skip_if_unavailable=False
 
 [eln-rs]
 name=Fedora - ELN ResilientStorage - Developmental packages for the next Enterprise Linux release
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/ResilientStorage/$basearch/os/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
+#baseurl=https://download.example/pub/eln/1/ResilientStorage/$basearch/os/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-resilientstorage-1&arch=$basearch
 enabled=0
 countme=1
 metadata_expire=6h
@@ -229,8 +229,8 @@ skip_if_unavailable=False
 
 [eln-rs-debuginfo]
 name=Fedora - ELN ResilientStorage - Debug
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/ResilientStorage/$basearch/debug/tree
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
+#baseurl=https://download.example/pub/eln/1/ResilientStorage/$basearch/debug/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-resilientstorage-debug-1&arch=$basearch
 enabled=0
 metadata_expire=6h
 repo_gpgcheck=0
@@ -241,8 +241,8 @@ skip_if_unavailable=False
 
 [eln-rs-source]
 name=Fedora - ELN ResilientStorage - Source
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/ResilientStorage/source/tree/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
+#baseurl=https://download.example/pub/eln/1/ResilientStorage/source/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-resilientstorage-source-1&arch=$basearch
 enabled=0
 metadata_expire=6h
 repo_gpgcheck=0
@@ -255,8 +255,8 @@ skip_if_unavailable=False
 
 [eln-rt]
 name=Fedora - ELN RT - Developmental packages for the next Enterprise Linux release
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/RT/$basearch/os/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
+#baseurl=https://download.example/pub/eln/1/RT/$basearch/os/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-rt-1&arch=$basearch
 enabled=0
 countme=1
 metadata_expire=6h
@@ -268,8 +268,8 @@ skip_if_unavailable=False
 
 [eln-rt-debuginfo]
 name=Fedora - ELN RT - Debug
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/RT/$basearch/debug/tree
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
+#baseurl=https://download.example/pub/eln/1/RT/$basearch/debug/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-rt-debug-1&arch=$basearch
 enabled=0
 metadata_expire=6h
 repo_gpgcheck=0
@@ -280,8 +280,8 @@ skip_if_unavailable=False
 
 [eln-rt-source]
 name=Fedora - ELN RT - Source
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/RT/source/tree/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
+#baseurl=https://download.example/pub/eln/1/RT/source/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-rt-source-1&arch=$basearch
 enabled=0
 metadata_expire=6h
 repo_gpgcheck=0
@@ -294,8 +294,8 @@ skip_if_unavailable=False
 
 [eln-nfv]
 name=Fedora - ELN NFV - Developmental packages for the next Enterprise Linux release
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/NFV/$basearch/os/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
+#baseurl=https://download.example/pub/eln/1/NFV/$basearch/os/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-nfv-1&arch=$basearch
 enabled=0
 countme=1
 metadata_expire=6h
@@ -307,8 +307,8 @@ skip_if_unavailable=False
 
 [eln-nfv-debuginfo]
 name=Fedora - ELN NFV - Debug
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/NFV/$basearch/debug/tree
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
+#baseurl=https://download.example/pub/eln/1/NFV/$basearch/debug/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-nfv-debug-1&arch=$basearch
 enabled=0
 metadata_expire=6h
 repo_gpgcheck=0
@@ -319,8 +319,8 @@ skip_if_unavailable=False
 
 [eln-nfv-source]
 name=Fedora - ELN NFV - Source
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/NFV/source/tree/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
+#baseurl=https://download.example/pub/eln/1/NFV/source/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-nfv-source-1&arch=$basearch
 enabled=0
 metadata_expire=6h
 repo_gpgcheck=0
@@ -333,8 +333,8 @@ skip_if_unavailable=False
 
 [eln-sap]
 name=Fedora - ELN SAP - Developmental packages for the next Enterprise Linux release
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAP/$basearch/os/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
+#baseurl=https://download.example/pub/eln/1/SAP/$basearch/os/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-sap-1&arch=$basearch
 enabled=0
 countme=1
 metadata_expire=6h
@@ -346,8 +346,8 @@ skip_if_unavailable=False
 
 [eln-sap-debuginfo]
 name=Fedora - ELN SAP - Debug
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAP/$basearch/debug/tree
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
+#baseurl=https://download.example/pub/eln/1/SAP/$basearch/debug/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-sap-debug-1&arch=$basearch
 enabled=0
 metadata_expire=6h
 repo_gpgcheck=0
@@ -358,8 +358,8 @@ skip_if_unavailable=False
 
 [eln-sap-source]
 name=Fedora - ELN SAP - Source
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAP/source/tree/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
+#baseurl=https://download.example/pub/eln/1/SAP/source/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-sap-source-1&arch=$basearch
 enabled=0
 metadata_expire=6h
 repo_gpgcheck=0
@@ -372,8 +372,8 @@ skip_if_unavailable=False
 
 [eln-saphana]
 name=Fedora - ELN SAPHANA - Developmental packages for the next Enterprise Linux release
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAPHANA/$basearch/os/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
+#baseurl=https://download.example/pub/eln/1/SAPHANA/$basearch/os/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-saphana-1&arch=$basearch
 enabled=0
 countme=1
 metadata_expire=6h
@@ -385,8 +385,8 @@ skip_if_unavailable=False
 
 [eln-saphana-debuginfo]
 name=Fedora - ELN SAPHANA - Debug
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAPHANA/$basearch/debug/tree
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
+#baseurl=https://download.example/pub/eln/1/SAPHANA/$basearch/debug/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-saphana-debug-1&arch=$basearch
 enabled=0
 metadata_expire=6h
 repo_gpgcheck=0
@@ -397,8 +397,8 @@ skip_if_unavailable=False
 
 [eln-saphana-source]
 name=Fedora - ELN SAPHANA - Source
-baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/SAPHANA/source/tree/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
+#baseurl=https://download.example/pub/eln/1/SAPHANA/source/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-saphana-source-1&arch=$basearch
 enabled=0
 metadata_expire=6h
 repo_gpgcheck=0
diff --git a/fedora-repos.spec b/fedora-repos.spec
index cd4f420..79a87f6 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -4,7 +4,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        42
-Release:        0.1%{?eln:.eln%{eln}}
+Release:        0.2%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -402,6 +402,9 @@ rm -f "$TMPRING"
 
 
 %changelog
+* Wed Sep 18 2024 Stephen Gallagher <sgallagh@redhat.com> - 42-0.2
+- Use mirror links for ELN
+
 * Tue Aug 13 2024 Samyak Jain <samyak.jn11@gmail.com> - 42-0.1
 - Setup for rawhide being F42
 

From 4926368a33afb98e06cae5d6103652239773d29e Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Tue, 22 Oct 2024 08:22:17 -0400
Subject: [PATCH 103/108] ELN: Drop ResilientStorage

https://github.com/fedora-eln/eln/issues/205

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
---
 fedora-eln.repo   | 39 ---------------------------------------
 fedora-repos.spec |  5 ++++-
 2 files changed, 4 insertions(+), 40 deletions(-)

diff --git a/fedora-eln.repo b/fedora-eln.repo
index ffcde5f..bbc2ade 100644
--- a/fedora-eln.repo
+++ b/fedora-eln.repo
@@ -214,45 +214,6 @@ skip_if_unavailable=False
 
 
 
-[eln-rs]
-name=Fedora - ELN ResilientStorage - Developmental packages for the next Enterprise Linux release
-#baseurl=https://download.example/pub/eln/1/ResilientStorage/$basearch/os/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-resilientstorage-1&arch=$basearch
-enabled=0
-countme=1
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
-skip_if_unavailable=False
-
-[eln-rs-debuginfo]
-name=Fedora - ELN ResilientStorage - Debug
-#baseurl=https://download.example/pub/eln/1/ResilientStorage/$basearch/debug/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-resilientstorage-debug-1&arch=$basearch
-enabled=0
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
-skip_if_unavailable=False
-
-[eln-rs-source]
-name=Fedora - ELN ResilientStorage - Source
-#baseurl=https://download.example/pub/eln/1/ResilientStorage/source/tree/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-resilientstorage-source-1&arch=$basearch
-enabled=0
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
-skip_if_unavailable=False
-
-
-
 [eln-rt]
 name=Fedora - ELN RT - Developmental packages for the next Enterprise Linux release
 #baseurl=https://download.example/pub/eln/1/RT/$basearch/os/
diff --git a/fedora-repos.spec b/fedora-repos.spec
index 79a87f6..71fdf8e 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -4,7 +4,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        42
-Release:        0.2%{?eln:.eln%{eln}}
+Release:        0.3%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -402,6 +402,9 @@ rm -f "$TMPRING"
 
 
 %changelog
+* Tue Oct 22 2024 Stephen Gallagher <sgallagh@redhat.com> - 42-0.3
+- ELN: Drop ResilientStorage
+
 * Wed Sep 18 2024 Stephen Gallagher <sgallagh@redhat.com> - 42-0.2
 - Use mirror links for ELN
 

From c16bb969068a8b9439595016ffe2681d4abf55cb Mon Sep 17 00:00:00 2001
From: Samyak Jain <samyak.jn11@gmail.com>
Date: Wed, 15 Jan 2025 10:32:40 +0530
Subject: [PATCH 104/108] Add Fedora 44 key

Signed-off-by: Samyak Jain <samyak.jn11@gmail.com>
---
 RPM-GPG-KEY-fedora-44-primary | 29 +++++++++++++++++++++++++++++
 archmap                       |  2 ++
 fedora-repos.spec             |  6 +++++-
 3 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 RPM-GPG-KEY-fedora-44-primary

diff --git a/RPM-GPG-KEY-fedora-44-primary b/RPM-GPG-KEY-fedora-44-primary
new file mode 100644
index 0000000..f859ab3
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-44-primary
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGeGrzsBEAC4UV5Ij9oz6h6abEKIRoiezttFfnLhwOAfE9tWtfIFMRmhY91u
+L88PKf12n2xHBd3oc5ahBzGeTBhaMV+VJAppoQMSOIMI5q966D9GQ0LkJT+E5bwn
+xGRJKp7qccevh2KFOUt2vHtFskhDOuAIupoKfo5FgI9PkvAVBsrUpO/22yjNv0V/
+aeDXxZhRX8m/8FKJ77VcZtBRPcp7M41bCmW9gV9IDpD81hAdTjYoQr1Y3KU0FTm5
+W4l1mf9mZcKMskOk08TyzQeC2YRB20EYRK439XCGJ4P7BFiOl96EbPpky2pHe2FV
+AvX474o3QEecTK3KxZrsRjmXOqpjRPy5YyMfKEYBM9j3zBDvpDFk79Mfuw5n2Nr5
+U4Wn/rqfhKLUKkfpfCow97nzq8NqynwS09yVobIfjHCKRtjwun6ife+s7R4L2nAu
+rTWPAHqzIjjW5nnjaFtoSulIadVKx+KibKajA6gRAc6K7xMyMTHfqZeTAIcawvX6
+h2d/nd8xCfogM5FTI5obNSUVNaMv5vQg6vcV1fb6oRgodF0Bi+1dssq5EMQpHFJM
+nIQ5NVwuzSjCLt3X2mWUp0mfIt2K9oBpBct12uXho7Nm1bSC5UFNYsvw+rj6vTqZ
+ilK9pyfcYmELv7a/NPkyuACsBFGoc66nBfrEvk57kW9FaJK9mjSqGftykQARAQAB
+tDFGZWRvcmEgKDQ0KSA8ZmVkb3JhLTQ0LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
+cmc+iQJSBBMBCAA8FiEENvYS3PJ/fRpIqDXk2/z3HG2fkKYFAmeGrzsCGw8FCwkI
+BwIDIgIBBhUKCQgLAgQWAgMBAh4HAheAAAoJENv89xxtn5CmIU0P/iaFVxJjVi4P
+yu8A04PbdGy2vuBBCceIjYn5HaMDwJMRjdJT6uMS494pSKNEl/JJ8K5rRdigfUV1
+2Z22X3kI5aNb4k2wpaPg5Xq0JQS9FvG4Pjm//kNy5WplmEA8HVg4MVkvySWiXay4
++tkCelhE8aQDstYEm3uh+lZ6udgoInfprwFMn6H+8RXkakTW1z5NkuAA8PpMDA9o
+SOFc4Hk6bhE6exEp4VNwBEkxwh4z9CGjarlXL4QEyM1UK60vtbXIHVjITjFfKVQP
+j6ifdn5X69oSuK+1mUFXEV+l9pc1mVjTVTwOrG3EMBsoekFyICp1pPtfMo1dxBed
+R8BFHqQFsFdmIG+59ycFznFOXzDRfaVn6OTEAk7T8nDqnpe/T4GlybLYic6KMKcM
+nbMLaJZjHZ97qJb5Scpsd1TWB5TDERi4VPB7NAVC/EwxMPC3IJUbRej/s05gNjg0
++2yyuV/U/DDnNGWnLTJDFLUaE8HhQBMvNSfmdMA47mo5CCuYmpzX/3M9vlVsv8/R
+xJBxFLIj9VFCPFNgXPeu9gyyytXeWgsIpDzMNJil9tgbBuQ1dX5GFMkWtK/kPexM
+KfiSU0JgJFfFSm0OKI/KXcRlbA1zP3IF+2YwbL+P5ePinHsDiAPLCQt/dWgw2tfB
+ZZLj9c3Ukew6Qobuy3V1knl564qQ6wjf
+=1m7R
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/archmap b/archmap
index 9132863..c3a4cb1 100644
--- a/archmap
+++ b/archmap
@@ -93,3 +93,5 @@ fedora-41-primary: x86_64 aarch64 ppc64le s390x
 fedora-42-primary: x86_64 aarch64 ppc64le s390x
 
 fedora-43-primary: x86_64 aarch64 ppc64le s390x
+
+fedora-44-primary: x86_64 aarch64 ppc64le s390x
diff --git a/fedora-repos.spec b/fedora-repos.spec
index 71fdf8e..6a105fc 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -4,7 +4,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        42
-Release:        0.3%{?eln:.eln%{eln}}
+Release:        0.4%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -83,6 +83,7 @@ Source60:       RPM-GPG-KEY-fedora-40-primary
 Source61:       RPM-GPG-KEY-fedora-41-primary
 Source62:       RPM-GPG-KEY-fedora-42-primary
 Source63:       RPM-GPG-KEY-fedora-43-primary
+Source64:       RPM-GPG-KEY-fedora-44-primary
 
 # When bumping Rawhide to fN, create N+1 key (and update archmap). (This
 # ensures users have the next future key installed and referenced, even if they
@@ -402,6 +403,9 @@ rm -f "$TMPRING"
 
 
 %changelog
+* Wed Jan 10 2025 Samyak Jain <samyak.jn11@gmail.com> - 42-0.4
+- Add RPM-GPG-KEY-fedora-44-primary
+
 * Tue Oct 22 2024 Stephen Gallagher <sgallagh@redhat.com> - 42-0.3
 - ELN: Drop ResilientStorage
 

From 68215b07bee9c0f0edcadebfd650f66652626dcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrik=20Polakovi=C4=8D?= <patrik@alphamail.org>
Date: Fri, 31 Jan 2025 14:50:54 +0100
Subject: [PATCH 105/108] Rawhide is now F43
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Patrik Polakovič <patrik@alphamail.org>
---
 fedora-repos.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index 6a105fc..103b112 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,10 +1,10 @@
-%global rawhide_release 42
+%global rawhide_release 43
 %global updates_testing_enabled 0
 
 Summary:        Fedora package repositories
 Name:           fedora-repos
-Version:        42
-Release:        0.4%{?eln:.eln%{eln}}
+Version:        43
+Release:        0.1%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -403,6 +403,9 @@ rm -f "$TMPRING"
 
 
 %changelog
+* Fri Jan 31 2025 Patrik Polakovic <patrik@alphamail.org> - 43-0.1
+- Rawhide is now F43
+
 * Wed Jan 10 2025 Samyak Jain <samyak.jn11@gmail.com> - 42-0.4
 - Add RPM-GPG-KEY-fedora-44-primary
 

From 373b64b71b2d87a2079a1aa3b556d359b7310ce1 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Thu, 13 Mar 2025 15:46:53 -0700
Subject: [PATCH 106/108] Add fedora-43/44 ima signing files

These are needed by IMA to verify files.
It's the ima cert signed by the fedorasigulca.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 fedora-43-ima.der | Bin 0 -> 431 bytes
 fedora-44-ima.der | Bin 0 -> 445 bytes
 fedora-repos.spec |   7 ++++++-
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 fedora-43-ima.der
 create mode 100644 fedora-44-ima.der

diff --git a/fedora-43-ima.der b/fedora-43-ima.der
new file mode 100644
index 0000000000000000000000000000000000000000..00cdae106d486d64f3f2153cdbbaff0ee593a193
GIT binary patch
literal 431
zcmXqLVq9&|#2B=InTe5!Nu-Q_i&Ijci2fYj`SHb}Z&y`32>D>Z#m1r4=5fxJg_*@b
z!cfdWgpE0rg_(!fEj1;-C{e-F*HOXQ(Lhd|*T~es*wEO>$k@`@EJ~c$$Q+4lAZsXX
zAPLba1l4I`4Az{ST2x{XX&}tT4z`Ag5o#YZBRjJb1B(jxe0|q*iq=Pb@*agIx)@Z|
z7AnPXODQkAyZ+~@tu>B|e(szgT6s9hu9G$Osmc-$D~{{Ei%wXvnw<$-RulMp@8VK}
zVgq3|=1^Hx79NmiwAmP0S=pJH4R}C;!i<dnS(pqM4ER7ieh`m^nTfr@Ko-R3V-aH!
znaDEhq{QDFJWIOTnoC|k{Bglq#>hY(B(2OMVIbBZvSI;`VVZrb{ha(yVID<~E7mh*
zYaj<3vpa)<3zI_Bn(aq6K4+8GxD(*m9pWHv`qj+qh+{^x@2$)K-gE!B#H8R<etwha
g!MTU~zw9*;|Fkt$qqA0hmRmrDw$@{YXKreb0EkwET>t<8

literal 0
HcmV?d00001

diff --git a/fedora-44-ima.der b/fedora-44-ima.der
new file mode 100644
index 0000000000000000000000000000000000000000..3d11e15ff795f83e5536a64550e3dd6e0f541687
GIT binary patch
literal 445
zcmXqLV%%xa#2CMTnTe5!NhDfyQ{vsvj9DjngJn1`EqZe?&}@kT7aNCGo5wj@7G@R$
z2}3ah5jN&f7G@q^x73vUqC^ExUq=OJM*}%=UL#WjLqiiI0|O&dqbPA+BXcCKftI0$
zff_`oJXEKN2}E;#N~&&gW_n&`Ub;eZYEg+nq=7ISJJ?PpMyTb?jO@%#3@rYN(=R-_
z$8^C(Q0S-c4(3;URg1M(A7Ng;rfj9clAT_Ua@IJX^4zo1vdF=EYiy46?~gtg6)kwh
zcn>=D7~A}wP`kL)px8i|jX6|Sm4yf7Gi^3TR#tXqW&<9OpfDrje-<VK1_M42j~~Qi
zVP;})FpvfD`B=nQM2uoD<R1w>oA*NETBMlMT|e9XJI@)&gQS&NBn-qFL{==|F-)^>
zwV#v!Da@njam9M3Yz^cvWcFY%aAi`^b7R$0(0pMp`%w4m-<e{o<qj1W&I$gy|E@;)
uv=t4rBbgK#cGN79ZVvO|h*}%0_2}*$W;Fq?jqP(4GJd!79`q}oE)4)IyoVJ4

literal 0
HcmV?d00001

diff --git a/fedora-repos.spec b/fedora-repos.spec
index 103b112..44f7e7d 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -4,7 +4,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        43
-Release:        0.1%{?eln:.eln%{eln}}
+Release:        0.2%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -99,6 +99,8 @@ Source501:      fedora-39-ima.der
 Source502:      fedora-40-ima.der
 Source503:      fedora-41-ima.der
 Source504:      fedora-42-ima.der
+Source505:      fedora-43-ima.der
+Source506:      fedora-44-ima.der
 
 %description
 Fedora package repository files for yum and dnf along with gpg public keys.
@@ -403,6 +405,9 @@ rm -f "$TMPRING"
 
 
 %changelog
+* Thu Mar 13 2025 Kevin Fenzi <kevin@scrye.com> - 43-0.2
+- Add fedora-43-ima.der and fedora-44-ima.der for ima signing.
+
 * Fri Jan 31 2025 Patrik Polakovic <patrik@alphamail.org> - 43-0.1
 - Rawhide is now F43
 

From 3605a30b13112dc858d5b98f0d42cee426e11c10 Mon Sep 17 00:00:00 2001
From: Samyak Jain <samyak.jn11@gmail.com>
Date: Mon, 4 Aug 2025 14:33:15 +0530
Subject: [PATCH 107/108] Add Fedora 45 Key and Der for signing

Signed-off-by: Samyak Jain <samyak.jn11@gmail.com>
---
 RPM-GPG-KEY-fedora-45-primary |  29 +++++++++++++++++++++++++++++
 archmap                       |   2 ++
 fedora-45-ima.der             | Bin 0 -> 445 bytes
 fedora-repos.spec             |   8 +++++++-
 4 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 RPM-GPG-KEY-fedora-45-primary
 create mode 100644 fedora-45-ima.der

diff --git a/RPM-GPG-KEY-fedora-45-primary b/RPM-GPG-KEY-fedora-45-primary
new file mode 100644
index 0000000..561934e
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-45-primary
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGiIvJgBEAD3LK442lirRR/SSY884GtAlFjC4VbtOW82pks44Nu/7sbWQObo
+A9kyCs69j/lCFKsq12yU+yk0rOSNHQT1aKwe64GOi9MokcOYK1gq0DtBvakl25o1
+pnBok+zuBUfwTQAsNTbevw1t5rdBJKusnuPPHjTnVdjVS9HU4QhZunI/7Y9QleX2
+oXkN2VFi0mhF2y8gU4Tve0xxSTjfgYM6ObV3W9vMusxmAabvCfdcVPpy9iEZxyjw
+NL4Svkw3bt50plmnRuWRXA+P6R3SK/1XKBW/9jVr4bgs6d763VfVCMbKLpQvuWIX
+6/UUOEc9LDziEjxjNBPFfLq+N7kN8235B26fuj+3XM2OqLtRv4/bl0Mryn13VrJl
+hvdLSlmkjROlzywrGvZ/geqyqaSuEZMnWN6znxV/qt8+tEHJXNFO882wHOLTq+5F
+6Bm/aJvdGxSffIFQyylcEzGaNgsH7AvkZPMqk2nMJ3y1KQx+LxdLM5hwGSexdaQ0
+wyW5DMH1Xn49J0nNE/IPWgBlRVAz146CNHMy0kR0J9dAUxg+1GeGKYnZ+q9mvs07
+82rFUqgJLq1gIBEVxYVh8eaO4u1wxWb+/LSx6OjZ7yFmZjN3c6V67Fwql/0EONic
+QgI/2FyxLeYmQr19Cl3EY7b50Ql95RT5OqtAnqcYrzsjuv4n489F/ObRjwARAQAB
+tDFGZWRvcmEgKDQ1KSA8ZmVkb3JhLTQ1LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
+cmc+iQJSBBMBCAA8FiEET1CmEUzVxpdqfxF5ZVpLAvV3hh4FAmiIvJgCGw8FCwkI
+BwIDIgIBBhUKCQgLAgQWAgMBAh4HAheAAAoJEGVaSwL1d4YeErcQAMnCTVRF+W1A
+W2kE9vQrqEXFj7wPXIH1uiwUAKtpLffjoD8SFekU6AqhrvMS1JgS0NsTwwvqbZXe
+Zl7eTgMZ8XPxhufZ272pUaIDMlREnvoLEHb/HTbcSP8bBdCEzc5FwSNgwZEYRTC/
+OVhJ1isF54fd3JC9741feCgPOMG94dj1VX7FlZuq1AQsXKvI9H3GEm6DiqHg4nVR
+WprMP7/sKqrgNSWx4s0zC/4WpALOgLXJO8qZOtul9SzcPmt4E56jjJ7TNX3uQcgu
+0zKFdzb92tJ6WLpVsFk5AgBoZFSi7xZEh+nQzu/PwMorxNyw2WvKR5+avWQCY/WO
+pmPIBAL4IevB/sGyrDVdh1ZNMTMIf3Pz3jkn2BGMOAo4ohP+5P4hFzt/4nOm5fL6
+DpJxlCcWaFjMuZgdJY9IHqRcwtnX4nGnrv0cbYAjt59cnHuzqzW84KWJcDEy+3v6
+jAhHn6UM27CGCN99hfh7zhj+fMcOOyugCwxbjke123uNC80J1WADB0KF99en1p1f
+1VHBOfS3IS8ezmlWFrllrG0Rxl1a9LDkQJivH5mV0HNmYvRPlWky/mP7q66TRHKs
+JfD7idqM7pdf6u4vYpGq/MlbGgK4xCm7geaoLWDN5zExgrgZFzgtieIEa2M1uumj
+BRh9EFo/y5xhwu9mVgCJmLCLW/ByEYJE
+=7kLn
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/archmap b/archmap
index c3a4cb1..fbc4aab 100644
--- a/archmap
+++ b/archmap
@@ -95,3 +95,5 @@ fedora-42-primary: x86_64 aarch64 ppc64le s390x
 fedora-43-primary: x86_64 aarch64 ppc64le s390x
 
 fedora-44-primary: x86_64 aarch64 ppc64le s390x
+
+fedora-45-primary: x86_64 aarch64 ppc64le s390x
diff --git a/fedora-45-ima.der b/fedora-45-ima.der
new file mode 100644
index 0000000000000000000000000000000000000000..6ad652db7fe33038f8e570ff4ad90410e392f52e
GIT binary patch
literal 445
zcmXqLV%%xa#2CMTnTe5!NhIOi<{2mUo;2&f|8`?`(5eNK#T{N6aItY{wRxPgWnpG9
zkT4W85Mg5uWnt#wbxTdjFG^JK^mSBlb~KO^=QT1lurM$&Ff%kVF^&@FH8Mxy8fY16
z7^p#X%0qRUm_jt?r=;o@XQt<6=A|nnrxukML>dUQv4iboVuV`G%*f8{#K6LS#<O6J
zqM<{}j6UZ|lMiBFx}WISfApNbt<~?woMxBBJDAv4XsUkvo?j4fwp{nlq)CRyqUE3O
zWKhta{Yu%|c){XQgJJ_=Hs(-SRTdtQ&$QVXSy|bcnGJYAg2If9|5=y}7!3G8Jbn<5
zg_()H!9W(o=VK9L5mCsDNlgw;O+9?0;<cpvY_@l?`_>uAgQS&NBn-qFL{==|F-)^>
zwV#v!Da@njam9M3Yz^cvWcFY%aAi_ZJ+wKL=b%o(#isvDggFm<R4a9OsWQbgSo*(u
v*FTAAQ<xMPUfpMHwtnpB`Q)}j)1SYqWAFEEeDld{mGJ$#9Y4y`*4P06N2!hy

literal 0
HcmV?d00001

diff --git a/fedora-repos.spec b/fedora-repos.spec
index 44f7e7d..060d834 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -4,7 +4,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        43
-Release:        0.2%{?eln:.eln%{eln}}
+Release:        0.3%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -84,6 +84,7 @@ Source61:       RPM-GPG-KEY-fedora-41-primary
 Source62:       RPM-GPG-KEY-fedora-42-primary
 Source63:       RPM-GPG-KEY-fedora-43-primary
 Source64:       RPM-GPG-KEY-fedora-44-primary
+Source65:       RPM-GPG-KEY-fedora-45-primary
 
 # When bumping Rawhide to fN, create N+1 key (and update archmap). (This
 # ensures users have the next future key installed and referenced, even if they
@@ -101,6 +102,7 @@ Source503:      fedora-41-ima.der
 Source504:      fedora-42-ima.der
 Source505:      fedora-43-ima.der
 Source506:      fedora-44-ima.der
+Source507:      fedora-45-ima.der
 
 %description
 Fedora package repository files for yum and dnf along with gpg public keys.
@@ -405,6 +407,10 @@ rm -f "$TMPRING"
 
 
 %changelog
+* Mon Aug 04 2025 Samyak Jain <samyak.jn11@gmail.com> - 43-0.3
+- Add RPM-GPG-KEY-fedora-45-primary
+- Add fedora-45-ima.der for ima signing.
+
 * Thu Mar 13 2025 Kevin Fenzi <kevin@scrye.com> - 43-0.2
 - Add fedora-43-ima.der and fedora-44-ima.der for ima signing.
 

From b38b2b9743f27ab776c2ef406f1c271d8f73339b Mon Sep 17 00:00:00 2001
From: Samyak Jain <samyak.jn11@gmail.com>
Date: Mon, 11 Aug 2025 17:54:14 +0530
Subject: [PATCH 108/108] Rawhide is now F44

Signed-off-by: Samyak Jain <samyak.jn11@gmail.com>
---
 fedora-repos.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/fedora-repos.spec b/fedora-repos.spec
index 060d834..1a23b9b 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,10 +1,10 @@
-%global rawhide_release 43
+%global rawhide_release 44
 %global updates_testing_enabled 0
 
 Summary:        Fedora package repositories
 Name:           fedora-repos
-Version:        43
-Release:        0.3%{?eln:.eln%{eln}}
+Version:        44
+Release:        0.1%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -407,6 +407,9 @@ rm -f "$TMPRING"
 
 
 %changelog
+* Mon Aug 11 2025 Samyak Jain <samyak.jn11@gmail.com> - 44-0.1
+- Rawhide is now F44
+
 * Mon Aug 04 2025 Samyak Jain <samyak.jn11@gmail.com> - 43-0.3
 - Add RPM-GPG-KEY-fedora-45-primary
 - Add fedora-45-ima.der for ima signing.