From bb5d30e28bcf2dffb00471565feb162a3b2df794 Mon Sep 17 00:00:00 2001 From: Samyak Jain Date: Sun, 11 Aug 2024 18:56:34 +0530 Subject: [PATCH 1/5] Branch Fedora 41 from Rawhide Signed-off-by: Samyak Jain --- fedora-repos.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index ee402ae..aa9f43e 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}} +Release: 0.4%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -402,6 +402,9 @@ rm -f "$TMPRING" %changelog +* Tue Aug 13 2024 Samyak Jain - 41-0.4 +- Setup for rawhide being F42 + * Sat Aug 10 2024 Samyak Jain - 41-0.3 - Add RPM-GPG-KEY-fedora-43-primary From 43232b025bbf1a23b14e597af09e8aaedf3e83c6 Mon Sep 17 00:00:00 2001 From: Samyak Jain Date: Tue, 3 Sep 2024 23:39:17 +0530 Subject: [PATCH 2/5] Enable updates-testing for branched. Fixes rhbz#2308952 Signed-off-by: Samyak Jain --- fedora-repos.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index aa9f43e..5b43f3c 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,10 +1,10 @@ %global rawhide_release 42 -%global updates_testing_enabled 0 +%global updates_testing_enabled 1 Summary: Fedora package repositories Name: fedora-repos Version: 41 -Release: 0.4%{?eln:.eln%{eln}} +Release: 0.5%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -402,6 +402,9 @@ rm -f "$TMPRING" %changelog +* Tue Sep 03 2024 Samyak Jain - 41-0.5 +- Enable updates-testing for branched. Fixes rhbz#2308952 + * Tue Aug 13 2024 Samyak Jain - 41-0.4 - Setup for rawhide being F42 From e9eab25676a9e28b9f9e3a18867663ee9fd3c3b9 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 18 Oct 2024 10:02:13 -0700 Subject: [PATCH 3/5] Disable updates-testing before f41 release. Signed-off-by: Kevin Fenzi --- fedora-repos.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index 5b43f3c..75dd5ac 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,10 +1,10 @@ %global rawhide_release 42 -%global updates_testing_enabled 1 +%global updates_testing_enabled 0 Summary: Fedora package repositories Name: fedora-repos Version: 41 -Release: 0.5%{?eln:.eln%{eln}} +Release: 1%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -402,6 +402,9 @@ rm -f "$TMPRING" %changelog +* Fri Oct 18 2024 Kevin Fenzi - 41-1 +- Disable updates-testing before f41 release. + * Tue Sep 03 2024 Samyak Jain - 41-0.5 - Enable updates-testing for branched. Fixes rhbz#2308952 From 4f7170d0b901c4130936aa7a29f6a10515eda50b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Polakovi=C4=8D?= Date: Tue, 4 Feb 2025 13:07:44 +0100 Subject: [PATCH 4/5] Add Fedora 44 key MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Patrik Polakovič --- RPM-GPG-KEY-fedora-44-primary | 29 +++++++++++++++++++++++++++++ archmap | 2 ++ fedora-repos.spec | 8 ++++++-- 3 files changed, 37 insertions(+), 2 deletions(-) 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 75dd5ac..6d2be42 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: 41 -Release: 1%{?eln:.eln%{eln}} +Release: 2%{?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 +* Tue Feb 04 2025 Patrik Polakovic - 41-2 +- Add RPM-GPG-KEY-fedora-44-primary + * Fri Oct 18 2024 Kevin Fenzi - 41-1 - Disable updates-testing before f41 release. From b8ea195d41367aefaefc654dcfcbc40582b66666 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 22 Oct 2024 08:22:17 -0400 Subject: [PATCH 5/5] ELN: Drop ResilientStorage https://github.com/fedora-eln/eln/issues/205 Signed-off-by: Stephen Gallagher (cherry picked from commit 4926368a33afb98e06cae5d6103652239773d29e) --- 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 c2c1275..8d8f71d 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://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/ResilientStorage/$basearch/os/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&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://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/ diff --git a/fedora-repos.spec b/fedora-repos.spec index 6d2be42..b8f1f0c 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -4,7 +4,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 41 -Release: 2%{?eln:.eln%{eln}} +Release: 3%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -403,6 +403,9 @@ rm -f "$TMPRING" %changelog +* Wed May 14 2025 Stephen Gallagher - 41-3 +- ELN: Drop ResilientStorage + * Tue Feb 04 2025 Patrik Polakovic - 41-2 - Add RPM-GPG-KEY-fedora-44-primary