From 9650f1ff1c1627867a6873edec42547d00d03ed8 Mon Sep 17 00:00:00 2001 From: nazunalika Date: Tue, 10 May 2022 04:07:39 -0700 Subject: [PATCH] fix rlpkg macro --- SPECS/rocky-release.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/SPECS/rocky-release.spec b/SPECS/rocky-release.spec index b8511c1..28b7fad 100644 --- a/SPECS/rocky-release.spec +++ b/SPECS/rocky-release.spec @@ -20,7 +20,7 @@ %define distro_code Blue Onyx %define major 9 %define minor 0 -%define rocky_rel 1%{?rllh:.%{rllh}}%{!?rllh:.13} +%define rocky_rel 1%{?rllh:.%{rllh}}%{!?rllh:.14} %define rpm_license BSD-3-Clause %define dist .el%{major} @@ -160,7 +160,7 @@ License: %{rpm_license} Provides: system-repos = %{version}-%{release} Provides: rocky-repos(%{major}) = %{full_release_version} Requires: system-release = %{version}-%{release} -Requires: rocky-gpg-keys +Requires: rocky-gpg-keys%{?rlpkg} Conflicts: %{name} < 8.0 %description -n rocky-repos%{?rlpkg} @@ -410,7 +410,7 @@ install -m 0644 %{SOURCE404} %{buildroot}/%{_prefix}/lib/sysctl.d/50-redhat.conf %{_datadir}/pki/sb-certs/* %changelog -* Sun May 01 2022 Louis Abel - 9.0-1.13 +* Sun May 01 2022 Louis Abel - 9.0-1.14 - Backport current SB certs for now - Add logrotate timer and switcheroo - Add missing macros @@ -422,6 +422,7 @@ install -m 0644 %{SOURCE404} %{buildroot}/%{_prefix}/lib/sysctl.d/50-redhat.conf - Change testing key to "testing" key from build system - Add official "stable" key from build system - List both GPG keys in repo files +- Fix rlpkg macro for gpg keys * Mon Jan 10 2022 Louis Abel - 9.0-1.1 - Add LOGO to /etc/os-release