From 5ae59dd43433c35cbf393edb08174f7e8fb84810 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 10 Aug 2021 17:47:36 +0200 Subject: [PATCH 01/12] F35 branched from rawhide Signed-off-by: Tomas Hrcka --- fedora-repos.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index 7f70dd1..e9bcc74 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,10 +1,10 @@ -%global rawhide_release 35 -%global updates_testing_enabled 0 +%global rawhide_release 36 +%global updates_testing_enabled 1 Summary: Fedora package repositories Name: fedora-repos Version: 35 -Release: 0.4%{?eln:.eln%{eln}} +Release: 0.5%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -391,6 +391,9 @@ rm -f "$TMPRING" %changelog +* Tue Aug 10 2021 Tomas Hrcka - 35-0.5 +- Update Rawhide definition, enable updates-testing for Branched + * Wed Apr 28 2021 Dusty Mabe - 35-0.4 - Enable the updates archive repo on non-rawhide. From 9c15d0901e088e0828fbc3675742acfe02253197 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 10 Aug 2021 19:56:19 +0200 Subject: [PATCH 02/12] Add F37 gpg key Signed-off-by: Tomas Hrcka --- 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 27576b7df33b2f3805db81397854fe38368c9d8a Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 10 Aug 2021 19:59:57 +0200 Subject: [PATCH 03/12] Add new key to the specfile Signed-off-by: Tomas Hrcka --- fedora-repos.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-repos.spec b/fedora-repos.spec index e9bcc74..70c3cd1 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 399c0290453ee996ed6db72a3b79c817ca81a391 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 10 Aug 2021 20:38:19 +0200 Subject: [PATCH 04/12] Add f37 to archmap Signed-off-by: Tomas Hrcka --- archmap | 2 ++ 1 file changed, 2 insertions(+) diff --git a/archmap b/archmap index 63d86ce..e24983a 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 \ No newline at end of file From de4e21bd00bf84ee97370d498e6de063f0c5739b Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 16 Aug 2021 16:58:41 -0400 Subject: [PATCH 05/12] 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 96c7193e98d7e865b6fd754e03a80c65336b7803 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 17 Aug 2021 16:27:21 -0700 Subject: [PATCH 06/12] Update revision and changelog for previous commit --- fedora-repos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index 70c3cd1..8a6c68e 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -4,7 +4,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 35 -Release: 0.5%{?eln:.eln%{eln}} +Release: 0.6%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -392,6 +392,9 @@ rm -f "$TMPRING" %changelog +* Tue Aug 17 2021 Adam Williamson - 35-0.6 +- Remove spurious space in RPM-GPG-KEY-fedora-37-primary (cgwalters) + * Tue Aug 10 2021 Tomas Hrcka - 35-0.5 - Update Rawhide definition, enable updates-testing for Branched From 156ac85f0962fc10f3dce4865d2c595e4ee2fa43 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 11 Oct 2021 10:26:52 -0700 Subject: [PATCH 07/12] Disable updates-testing for GA. (#2012948) --- fedora-repos.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index 8a6c68e..71d1144 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,10 +1,10 @@ %global rawhide_release 36 -%global updates_testing_enabled 1 +%global updates_testing_enabled 0 Summary: Fedora package repositories Name: fedora-repos Version: 35 -Release: 0.6%{?eln:.eln%{eln}} +Release: 1%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -392,6 +392,9 @@ rm -f "$TMPRING" %changelog +* Mon Oct 11 2021 Kevin Fenzi - 35-1 +- Disable updates-testing for GA. (#2012948) + * Tue Aug 17 2021 Adam Williamson - 35-0.6 - Remove spurious space in RPM-GPG-KEY-fedora-37-primary (cgwalters) From bdd12b739894ad69eff8dffd35df20ac823ac126 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 9 Aug 2022 19:33:22 +0200 Subject: [PATCH 08/12] Update rawhide definition add f38-39 keys Signed-off-by: Tomas Hrcka --- RPM-GPG-KEY-fedora-38-primary | 29 +++++++++++++++++++++++++++++ RPM-GPG-KEY-fedora-39-primary | 29 +++++++++++++++++++++++++++++ fedora-repos.spec | 8 +++++++- 3 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 RPM-GPG-KEY-fedora-38-primary create mode 100644 RPM-GPG-KEY-fedora-39-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/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 71d1144..eeb684e 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -4,7 +4,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 35 -Release: 1%{?eln:.eln%{eln}} +Release: 2%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -77,6 +77,8 @@ 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 +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). @@ -392,6 +394,10 @@ rm -f "$TMPRING" %changelog +* Tue Aug 09 2022 Tomas Hrcka - 35-2 +- Update rawhide definition +- Add f38 & f39 keys + * Mon Oct 11 2021 Kevin Fenzi - 35-1 - Disable updates-testing for GA. (#2012948) From 8f87cceac1b4b908b46a1ccb43a4b4a79fbade6d Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 9 Aug 2022 19:47:48 +0200 Subject: [PATCH 09/12] update archmap Signed-off-by: Tomas Hrcka --- archmap | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/archmap b/archmap index e24983a..0085675 100644 --- a/archmap +++ b/archmap @@ -80,4 +80,8 @@ 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 \ No newline at end of file +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 \ No newline at end of file From 00ff834f7e449927bdab08b4b4ca6077968bff92 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 9 Aug 2022 21:10:50 +0200 Subject: [PATCH 10/12] Updated archmap Signed-off-by: Tomas Hrcka --- archmap | 4 ++-- fedora-repos.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/archmap b/archmap index 0085675..1e0f033 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 \ No newline at end of file +fedora-39-primary: x86_64 aarch64 ppc64le s390x \ No newline at end of file diff --git a/fedora-repos.spec b/fedora-repos.spec index eeb684e..7a98df4 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -4,7 +4,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 35 -Release: 2%{?eln:.eln%{eln}} +Release: 3%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -394,6 +394,9 @@ rm -f "$TMPRING" %changelog +* Tue Aug 09 2022 Tomas Hrcka - 35-3 +- Updated archmap + * Tue Aug 09 2022 Tomas Hrcka - 35-2 - Update rawhide definition - Add f38 & f39 keys From 9135628f2819e19e331b77b3d4e488f82a902552 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Mon, 15 Aug 2022 11:04:42 -0400 Subject: [PATCH 11/12] 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 6a569710118510e72388091c41c98bd099dda9d3 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 16 Aug 2022 22:08:01 -0400 Subject: [PATCH 12/12] Bump release, update changelog --- fedora-repos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index 7a98df4..d0fd4a6 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -4,7 +4,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 35 -Release: 3%{?eln:.eln%{eln}} +Release: 4%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -394,6 +394,9 @@ rm -f "$TMPRING" %changelog +* Tue Aug 16 2022 Adam Williamson - 35-4 +- Fix RPM-GPG-KEY-fedora-39-primary + * Tue Aug 09 2022 Tomas Hrcka - 35-3 - Updated archmap