fix rlpkg macro

This commit is contained in:
nazunalika 2022-05-10 04:07:39 -07:00
parent a4fccc3206
commit 9650f1ff1c
Signed by: label
GPG Key ID: 6735C0E1BD65D048

View File

@ -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 <label@rockylinux.org> - 9.0-1.13
* Sun May 01 2022 Louis Abel <label@rockylinux.org> - 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 <label@rockylinux.org> - 9.0-1.1
- Add LOGO to /etc/os-release