From 0016d7529258859dda17f93c2c493e6b9c9acb51 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 13 Aug 2019 16:29:43 +0200 Subject: [PATCH 01/11] Bump spec, diasble rawhide repositories and enable updates and testing repositories Signed-off-by: Tomas Hrcka --- archmap | 2 ++ fedora-modular.repo | 2 +- fedora-rawhide-modular.repo | 2 +- fedora-rawhide.repo | 2 +- fedora-repos.spec | 6 +++++- fedora-updates-modular.repo | 2 +- fedora-updates-testing-modular.repo | 2 +- fedora-updates-testing.repo | 2 +- fedora-updates.repo | 2 +- fedora.repo | 2 +- 10 files changed, 15 insertions(+), 9 deletions(-) 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-modular.repo b/fedora-modular.repo index 46f78e6..d60efce 100644 --- a/fedora-modular.repo +++ b/fedora-modular.repo @@ -2,7 +2,7 @@ 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 +enabled=1 #metadata_expire=7d repo_gpgcheck=0 type=rpm diff --git a/fedora-rawhide-modular.repo b/fedora-rawhide-modular.repo index 9d0a63c..27d40b3 100644 --- a/fedora-rawhide-modular.repo +++ b/fedora-rawhide-modular.repo @@ -23,7 +23,7 @@ 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 +enabled=0 metadata_expire=6h repo_gpgcheck=0 type=rpm diff --git a/fedora-rawhide.repo b/fedora-rawhide.repo index 445b5da..3d66772 100644 --- a/fedora-rawhide.repo +++ b/fedora-rawhide.repo @@ -23,7 +23,7 @@ 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 +enabled=0 metadata_expire=6h repo_gpgcheck=0 type=rpm diff --git a/fedora-repos.spec b/fedora-repos.spec index a82e2a2..4622f88 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}} +Release: 0.4%{?_module_build:%{?dist}} License: MIT URL: https://fedoraproject.org/ @@ -166,6 +166,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 Tomas Hrcka - 31-0.4 +- Disable rawhide and rawhide-modular +- Enable fedora, updates, updates-testing repositories + * Tue Mar 12 2019 Vít Ondruch - 31-0.3 - Allow to use newer GPG keys, so Rawhide can be updated after branch. diff --git a/fedora-updates-modular.repo b/fedora-updates-modular.repo index c5b739f..0aab711 100644 --- a/fedora-updates-modular.repo +++ b/fedora-updates-modular.repo @@ -3,7 +3,7 @@ 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 +enabled=1 repo_gpgcheck=0 type=rpm gpgcheck=1 diff --git a/fedora-updates-testing-modular.repo b/fedora-updates-testing-modular.repo index 2be7ad0..97673d1 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.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 +enabled=1 repo_gpgcheck=0 type=rpm gpgcheck=1 diff --git a/fedora-updates-testing.repo b/fedora-updates-testing.repo index 21e0812..85a9363 100644 --- a/fedora-updates-testing.repo +++ b/fedora-updates-testing.repo @@ -2,7 +2,7 @@ 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 +enabled=1 repo_gpgcheck=0 type=rpm gpgcheck=1 diff --git a/fedora-updates.repo b/fedora-updates.repo index 4d5812a..5f4395d 100644 --- a/fedora-updates.repo +++ b/fedora-updates.repo @@ -2,7 +2,7 @@ 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 +enabled=1 repo_gpgcheck=0 type=rpm gpgcheck=1 diff --git a/fedora.repo b/fedora.repo index faf643e..26c7868 100644 --- a/fedora.repo +++ b/fedora.repo @@ -2,7 +2,7 @@ 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 +enabled=1 #metadata_expire=7d repo_gpgcheck=0 type=rpm From f61ebe3f1e068afc6efeafd845d391de8f63f30c Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 19 Aug 2019 08:48:41 -0700 Subject: [PATCH 02/11] add the fedora 32 key to fedora 31 repos Signed-off-by: Kevin Fenzi --- RPM-GPG-KEY-fedora-32-primary | 28 ++++++++++++++++++++++++++++ fedora-repos.spec | 6 +++++- 2 files changed, 33 insertions(+), 1 deletion(-) 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..67bde34 --- /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/fedora-repos.spec b/fedora-repos.spec index 4622f88..34d9e84 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,7 +1,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 31 -Release: 0.4%{?_module_build:%{?dist}} +Release: 0.5%{?_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,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 - 31-0.5 +- Add Fedora 32 key. + * Tue Aug 13 2019 Tomas Hrcka - 31-0.4 - Disable rawhide and rawhide-modular - Enable fedora, updates, updates-testing repositories From 8db5b64bf0a0999f630f9850e41b8b0d35e5c0a4 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 21 Aug 2019 18:36:40 +0100 Subject: [PATCH 03/11] Don't require fedora-repos-rawhide Signed-off-by: Peter Robinson --- fedora-repos.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index 34d9e84..57768db 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,13 +1,12 @@ Summary: Fedora package repositories Name: fedora-repos Version: 31 -Release: 0.5%{?_module_build:%{?dist}} +Release: 0.6%{?_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} Obsoletes: fedora-repos-anaconda < 22-0.3 Obsoletes: fedora-repos-modular < 29-0.6 @@ -167,6 +166,9 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/ /etc/ostree/remotes.d/fedora.conf %changelog +* Wed Aug 21 2019 Peter Robinson 31-0.6 +- Don't require fedora-repos-rawhide + * Mon Aug 19 2019 Kevin Fenzi - 31-0.5 - Add Fedora 32 key. From f1a3e01a76ad7818d3dfd9d7a8d91dc4ce3ff28f Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 10 Oct 2019 13:14:00 -0400 Subject: [PATCH 04/11] Setup for F31 Final Signed-off-by: Mohan Boddu --- fedora-repos.spec | 5 ++++- fedora-updates-testing-modular.repo | 2 +- fedora-updates-testing.repo | 2 +- fedora.repo | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index 57768db..80b1022 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,7 +1,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 31 -Release: 0.6%{?_module_build:%{?dist}} +Release: 1%{?_module_build:%{?dist}} License: MIT URL: https://fedoraproject.org/ @@ -166,6 +166,9 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/ /etc/ostree/remotes.d/fedora.conf %changelog +* Thu Oct 10 2019 Mohan Boddu - 31-1 +- Setup for F31 Final + * Wed Aug 21 2019 Peter Robinson 31-0.6 - Don't require fedora-repos-rawhide diff --git a/fedora-updates-testing-modular.repo b/fedora-updates-testing-modular.repo index 97673d1..2be7ad0 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.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=1 +enabled=0 repo_gpgcheck=0 type=rpm gpgcheck=1 diff --git a/fedora-updates-testing.repo b/fedora-updates-testing.repo index 85a9363..21e0812 100644 --- a/fedora-updates-testing.repo +++ b/fedora-updates-testing.repo @@ -2,7 +2,7 @@ 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=1 +enabled=0 repo_gpgcheck=0 type=rpm gpgcheck=1 diff --git a/fedora.repo b/fedora.repo index 26c7868..6e92079 100644 --- a/fedora.repo +++ b/fedora.repo @@ -3,7 +3,7 @@ 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=1 -#metadata_expire=7d +metadata_expire=7d repo_gpgcheck=0 type=rpm gpgcheck=1 From 8b05e6f9f06824b9b43401eecf8173481608a5e6 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Mon, 10 Feb 2020 14:37:04 +0100 Subject: [PATCH 05/11] 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 --- 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 d60efce..b29ede9 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=1 #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 27d40b3..89d68cf 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=0 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 3d66772..e7f403b 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=0 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 0aab711..d82088b 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=1 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 5f4395d..4b18e98 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=1 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 6e92079..7946e6f 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=1 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 e041d3bcd8394edd549fe693123fdf8c57c9e631 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 9 Mar 2020 17:43:40 -0700 Subject: [PATCH 06/11] Remove the obsolete failovermethod from f31 fedora-repos. See https://bugzilla.redhat.com/show_bug.cgi?id=1770619 Signed-off-by: Kevin Fenzi --- fedora-updates-modular.repo | 3 --- 1 file changed, 3 deletions(-) diff --git a/fedora-updates-modular.repo b/fedora-updates-modular.repo index d82088b..d7b4bd9 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=1 repo_gpgcheck=0 @@ -12,7 +11,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 @@ -24,7 +22,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 ac569beb75887376df556fe22e92bbe3ab23a157 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Mon, 23 Mar 2020 14:52:35 -0400 Subject: [PATCH 07/11] Remove the obsolete failovermethod from f31 fedora-repos. (kevin) Signed-off-by: Mohan Boddu --- fedora-repos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index 80b1022..5313a20 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,7 +1,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 31 -Release: 1%{?_module_build:%{?dist}} +Release: 2%{?_module_build:%{?dist}} License: MIT URL: https://fedoraproject.org/ @@ -166,6 +166,9 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/ /etc/ostree/remotes.d/fedora.conf %changelog +* Mon Mar 23 2020 Mohan Boddu - 31-2 +- Remove the obsolete failovermethod from f31 fedora-repos. (kevin) + * Thu Oct 10 2019 Mohan Boddu - 31-1 - Setup for F31 Final From dec874c255b70aafd183bf1746dbe3a8496d86d8 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 18 Feb 2020 09:47:29 -0800 Subject: [PATCH 08/11] 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 --- 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 b29ede9..cab9c11 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=1 #metadata_expire=7d @@ -11,6 +12,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 @@ -22,6 +24,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 89d68cf..9de0bf7 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=0 metadata_expire=6h @@ -32,6 +33,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 @@ -42,6 +44,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 e7f403b..72117a4 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=0 metadata_expire=6h @@ -32,6 +33,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 @@ -42,6 +44,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 d7b4bd9..88d9edb 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=1 repo_gpgcheck=0 @@ -11,6 +12,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 @@ -22,6 +24,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 2199e86..9edd7af 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 repo_gpgcheck=0 @@ -11,6 +12,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 @@ -22,6 +24,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 32c0794..3e78451 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 repo_gpgcheck=0 @@ -11,6 +12,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 @@ -22,6 +24,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 4b18e98..0f34cb1 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=1 repo_gpgcheck=0 @@ -11,6 +12,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 @@ -22,6 +24,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 7946e6f..8c3a3e4 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=1 metadata_expire=7d @@ -11,6 +12,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 @@ -22,6 +24,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 8fe94ed47e4ae085d4dcd2cca60e75ba1995f077 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 17 Apr 2020 18:04:34 -0700 Subject: [PATCH 09/11] Bump release Signed-off-by: Adam Williamson --- fedora-repos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index 5313a20..35ddf8b 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,7 +1,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 31 -Release: 2%{?_module_build:%{?dist}} +Release: 3%{?_module_build:%{?dist}} License: MIT URL: https://fedoraproject.org/ @@ -166,6 +166,9 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/ /etc/ostree/remotes.d/fedora.conf %changelog +* Fri Apr 17 2020 Adam Williamson - 31-3 +- Re-add baseurl lines, but using example domain + * Mon Mar 23 2020 Mohan Boddu - 31-2 - Remove the obsolete failovermethod from f31 fedora-repos. (kevin) From f5ab390451b17a0cc3223e9f80afbc0f30aede7a Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Mon, 17 Aug 2020 16:25:12 -0400 Subject: [PATCH 10/11] Adding f33, f34 keys Signed-off-by: Mohan Boddu --- RPM-GPG-KEY-fedora-33-primary | 28 ++++++++++++++++++++++++++++ RPM-GPG-KEY-fedora-34-primary | 29 +++++++++++++++++++++++++++++ fedora-repos.spec | 7 ++++++- 3 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 RPM-GPG-KEY-fedora-33-primary create mode 100644 RPM-GPG-KEY-fedora-34-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/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 35ddf8b..dd5c9ec 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,7 +1,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 31 -Release: 3%{?_module_build:%{?dist}} +Release: 4%{?_module_build:%{?dist}} License: MIT URL: https://fedoraproject.org/ @@ -63,6 +63,8 @@ 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 +Source54: RPM-GPG-KEY-fedora-34-primary Source100: fedora-modular.repo Source101: fedora-updates-modular.repo @@ -166,6 +168,9 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/ /etc/ostree/remotes.d/fedora.conf %changelog +* Mon Aug 17 2020 Mohan Boddu - 31-4 +- Adding f33, f34 keys + * Fri Apr 17 2020 Adam Williamson - 31-3 - Re-add baseurl lines, but using example domain From d58a21283cbc416563c26968a7b57c87f8cab562 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 21 Aug 2020 13:30:23 -0700 Subject: [PATCH 11/11] Add missing per-arch symlinks for f33, f34 keys --- archmap | 4 ++++ fedora-repos.spec | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/archmap b/archmap index b602401..3a83fff 100644 --- a/archmap +++ b/archmap @@ -68,3 +68,7 @@ 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 + +fedora-34-primary: i386 x86_64 armhfp aarch64 ppc64le s390x diff --git a/fedora-repos.spec b/fedora-repos.spec index dd5c9ec..09a256a 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,7 +1,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 31 -Release: 4%{?_module_build:%{?dist}} +Release: 5%{?_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 +* Fri Aug 21 2020 Adam Williamson - 31-5 +- Add missing per-arch symlinks for f33, f34 keys + * Mon Aug 17 2020 Mohan Boddu - 31-4 - Adding f33, f34 keys