ykohut/leapp-repository
1
0
Fork 0
forked from rpms/leapp-repository
Code Pull Requests Activity

Merge pull request 'Add PostgreSQL's gpg-pubkey-73e3b907-6581b071 key to the list of obsoleted ones for 9' (#6) from ykohut/leapp-repository:a8-elevate-0200 into a8-elevate-0200

Browse Source 
Reviewed-on: rpms/leapp-repository#6
This commit is contained in:
Andrew Lukoshko 2024-08-15 14:20:11 +00:00
commit 6c104f3f3a
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SOURCES/leapp-repository-0.20.0-elevate.patch
View File

@ -4185,10 +4185,10 @@ index f9411dfe..c81c9618 100644
+ rpm_tasks.to_reinstall = sorted(pkgs_to_reinstall)
api.produce(rpm_tasks)
diff --git a/repos/system_upgrade/common/actors/removeobsoletegpgkeys/libraries/removeobsoleterpmgpgkeys.py b/repos/system_upgrade/common/actors/removeobsoletegpgkeys/libraries/removeobsoleterpmgpgkeys.py
index 1cc5d64f..11c61e36 100644
index 1cc5d64f..4f9424b7 100644
--- a/repos/system_upgrade/common/actors/removeobsoletegpgkeys/libraries/removeobsoleterpmgpgkeys.py
+++ b/repos/system_upgrade/common/actors/removeobsoletegpgkeys/libraries/removeobsoleterpmgpgkeys.py
@@ -11,7 +11,11 @@ OBSOLETED_KEYS_MAP = {
@@ -11,7 +11,12 @@ OBSOLETED_KEYS_MAP = {
"gpg-pubkey-37017186-45761324",
"gpg-pubkey-db42a60e-37ea5438",
],
@ -4197,6 +4197,7 @@ index 1cc5d64f..11c61e36 100644
+ "gpg-pubkey-d4082792-5b32db75",
+ "gpg-pubkey-3abb34f8-5ffd890e",
+ "gpg-pubkey-6275f250-5e26cb2e",
+ "gpg-pubkey-73e3b907-6581b071", # PostgreSQL RPM Repository <pgsql-pkg-yum@lists.postgresql.org>
+ ],
}

5
SPECS/leapp-repository.spec
View File

@ -43,7 +43,7 @@ py2_byte_compile "%1" "%2"}
Epoch: 1
Name: leapp-repository
Version: 0.20.0
Release: 2%{?dist}.elevate.1
Release: 2%{?dist}.elevate.2
Summary: Repositories for leapp
License: ASL 2.0
@ -290,6 +290,9 @@ done;
# no files here
%changelog
* Thu Aug 15 2024 Yuriy Kohut <ykohut@almalinux.org> - 0.20.0-2.elevate.2
- Add PostgreSQL's gpg-pubkey-73e3b907-6581b071 key to the list of obsoleted ones for 9
* Fri Aug 09 2024 Yuriy Kohut <ykohut@almalinux.org> - 0.20.0-2.elevate.1
- Vendors support