From 9730f2743673301ce06da28a3f60366d3ad0bb67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 15 Jul 2024 15:26:35 +0200 Subject: [PATCH] Use librpmio instead of gpgme for handling PGP keys Resolves: RHEL-47106 --- 0001-Use-rpm-sequoia-on-RHEL-10.patch | 31 +++++++++++++++++++++++++++ librepo.spec | 8 +++++-- 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 0001-Use-rpm-sequoia-on-RHEL-10.patch diff --git a/0001-Use-rpm-sequoia-on-RHEL-10.patch b/0001-Use-rpm-sequoia-on-RHEL-10.patch new file mode 100644 index 0000000..0169c54 --- /dev/null +++ b/0001-Use-rpm-sequoia-on-RHEL-10.patch @@ -0,0 +1,31 @@ +From f94e05110f5d670c71624c18cb479083c3ae3e51 Mon Sep 17 00:00:00 2001 +From: Yaakov Selkowitz +Date: Mon, 8 Jul 2024 11:28:30 -0400 +Subject: [PATCH] Use rpm-sequoia on RHEL 10+ +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +RHEL 10 also has a sufficiently new RPM with rpm-sequoia enabled. + +Signed-off-by: Petr Písař +--- + librepo.spec | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/librepo.spec b/librepo.spec +index 25dc741..62035dc 100644 +--- a/librepo.spec ++++ b/librepo.spec +@@ -8,7 +8,7 @@ + %bcond_without zchunk + %endif + +-%if 0%{?fedora} >= 39 ++%if 0%{?fedora} >= 39 || 0%{?rhel} >= 10 + %bcond_with use_gpgme + %bcond_with use_selinux + %else +-- +2.45.2 + diff --git a/librepo.spec b/librepo.spec index 66a453e..ef15d73 100644 --- a/librepo.spec +++ b/librepo.spec @@ -8,7 +8,7 @@ %bcond_without zchunk %endif -%if 0%{?fedora} >= 39 +%if 0%{?fedora} >= 39 || 0%{?rhel} >= 10 %bcond_with use_gpgme %bcond_with use_selinux %else @@ -29,12 +29,13 @@ Name: librepo Version: 1.18.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Repodata downloading library License: LGPL-2.1-or-later URL: https://github.com/rpm-software-management/librepo Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +Patch0: 0001-Use-rpm-sequoia-on-RHEL-10.patch BuildRequires: cmake BuildRequires: gcc @@ -127,6 +128,9 @@ Python 3 bindings for the librepo library. %{python3_sitearch}/%{name}/ %changelog +* Mon Jul 15 2024 Petr Pisar - 1.18.0-2 +- Use librpmio instead of gpgme for handling PGP keys (RHEL-47106) + * Tue Jul 02 2024 Evan Goode - 1.18.0-1 - Update to 1.18.0 (RHEL-35699) - API: Add LRO_USERNAME and LRO_PASSWORD options