rpms/rpm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix Conflicts in new rpm-sign backends

Browse Source 
Related: RHEL-56363
This commit is contained in:
Michal Domonkos 2024-10-25 12:55:18 +02:00
parent c7a072acc0
commit 0f0847f87a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rpm.spec
View File

@ -27,7 +27,7 @@
%global rpmver 4.19.1.1 %global rpmver 4.19.1.1
#global snapver rc1 #global snapver rc1
%global baserelease 4 %global baserelease 5
%global sover 10 %global sover 10
%global srcver %{rpmver}%{?snapver:-%{snapver}} %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 Summary: Support for signing RPM packages using GnuPG
Requires: gnupg2 Requires: gnupg2
Requires(meta): rpm-sign-libs%{_isa} >= %{version}-%{release} Requires(meta): rpm-sign-libs%{_isa} >= %{version}-%{release}
Conflicts: sign-sequoia Conflicts: rpm-sign-sequoia
%description sign-gnupg %description sign-gnupg
This package provides configuration for signing RPM packages using 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 Summary: Support for signing RPM packages using Sequoia
Requires: sequoia-sq Requires: sequoia-sq
Requires(meta): rpm-sign-libs%{_isa} >= %{version}-%{release} Requires(meta): rpm-sign-libs%{_isa} >= %{version}-%{release}
Conflicts: sign-gnupg Conflicts: rpm-sign-gnupg
%description sign-sequoia %description sign-sequoia
This package provides configuration for signing RPM packages using Sequoia. This package provides configuration for signing RPM packages using Sequoia.
@ -653,6 +653,9 @@ fi
%doc %{_defaultdocdir}/rpm/API/ %doc %{_defaultdocdir}/rpm/API/
%changelog %changelog
* Fri Oct 25 2024 Michal Domonkos <mdomonko@redhat.com> - 4.19.1.1-5
- Fix Conflicts in new rpm-sign backends
* Mon Oct 14 2024 Panu Matilainen <pmatilai@redhat.com> - 4.19.1.1-4 * Mon Oct 14 2024 Panu Matilainen <pmatilai@redhat.com> - 4.19.1.1-4
- Remove hardcoded GPG references from signing error messages - Remove hardcoded GPG references from signing error messages
- Support switching between GnuPG and Sequoia for package signing (RHEL-56363) - Support switching between GnuPG and Sequoia for package signing (RHEL-56363)