From 0f0847f87a5bf30b0df9daed8ed626ac37c73210 Mon Sep 17 00:00:00 2001 From: Michal Domonkos Date: Oct 25 2024 10:57:03 +0000 Subject: Fix Conflicts in new rpm-sign backends Related: RHEL-56363 --- diff --git a/rpm.spec b/rpm.spec index 21c9ef0..2547c95 100644 --- a/rpm.spec +++ b/rpm.spec @@ -27,7 +27,7 @@ %global rpmver 4.19.1.1 #global snapver rc1 -%global baserelease 4 +%global baserelease 5 %global sover 10 %global srcver %{rpmver}%{?snapver:-%{snapver}} @@ -193,7 +193,7 @@ This package contains the RPM shared libraries for signing packages. Summary: Support for signing RPM packages using GnuPG Requires: gnupg2 Requires(meta): rpm-sign-libs%{_isa} >= %{version}-%{release} -Conflicts: sign-sequoia +Conflicts: rpm-sign-sequoia %description sign-gnupg This package provides configuration for signing RPM packages using GnuPG. @@ -202,7 +202,7 @@ This package provides configuration for signing RPM packages using GnuPG. Summary: Support for signing RPM packages using Sequoia Requires: sequoia-sq Requires(meta): rpm-sign-libs%{_isa} >= %{version}-%{release} -Conflicts: sign-gnupg +Conflicts: rpm-sign-gnupg %description sign-sequoia This package provides configuration for signing RPM packages using Sequoia. @@ -653,6 +653,9 @@ fi %doc %{_defaultdocdir}/rpm/API/ %changelog +* Fri Oct 25 2024 Michal Domonkos - 4.19.1.1-5 +- Fix Conflicts in new rpm-sign backends + * Mon Oct 14 2024 Panu Matilainen - 4.19.1.1-4 - Remove hardcoded GPG references from signing error messages - Support switching between GnuPG and Sequoia for package signing (RHEL-56363)