Use librpmio instead of gpgme for handling PGP keys

Resolves: RHEL-47106
This commit is contained in:
Petr Písař 2024-07-15 15:26:35 +02:00
parent 54ca446c17
commit 9730f27436
2 changed files with 37 additions and 2 deletions

View File

@ -0,0 +1,31 @@
From f94e05110f5d670c71624c18cb479083c3ae3e51 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
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ř <ppisar@redhat.com>
---
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

View File

@ -8,7 +8,7 @@
%bcond_without zchunk %bcond_without zchunk
%endif %endif
%if 0%{?fedora} >= 39 %if 0%{?fedora} >= 39 || 0%{?rhel} >= 10
%bcond_with use_gpgme %bcond_with use_gpgme
%bcond_with use_selinux %bcond_with use_selinux
%else %else
@ -29,12 +29,13 @@
Name: librepo Name: librepo
Version: 1.18.0 Version: 1.18.0
Release: 1%{?dist} Release: 2%{?dist}
Summary: Repodata downloading library Summary: Repodata downloading library
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
URL: https://github.com/rpm-software-management/librepo URL: https://github.com/rpm-software-management/librepo
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
Patch0: 0001-Use-rpm-sequoia-on-RHEL-10.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: gcc BuildRequires: gcc
@ -127,6 +128,9 @@ Python 3 bindings for the librepo library.
%{python3_sitearch}/%{name}/ %{python3_sitearch}/%{name}/
%changelog %changelog
* Mon Jul 15 2024 Petr Pisar <ppisar@redhat.com> - 1.18.0-2
- Use librpmio instead of gpgme for handling PGP keys (RHEL-47106)
* Tue Jul 02 2024 Evan Goode <egoode@redhat.com> - 1.18.0-1 * Tue Jul 02 2024 Evan Goode <egoode@redhat.com> - 1.18.0-1
- Update to 1.18.0 (RHEL-35699) - Update to 1.18.0 (RHEL-35699)
- API: Add LRO_USERNAME and LRO_PASSWORD options - API: Add LRO_USERNAME and LRO_PASSWORD options