From a121f3909bcfae485143970c3014c565b081ad40 Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Fri, 7 Jun 2024 06:32:53 -0700 Subject: [PATCH] fix macros --- SPECS/rocky-release.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/SPECS/rocky-release.spec b/SPECS/rocky-release.spec index e624efb..5a72c88 100644 --- a/SPECS/rocky-release.spec +++ b/SPECS/rocky-release.spec @@ -21,7 +21,7 @@ %define distro_code Blue Onyx %define major 9 %define minor 4 -%define rocky_rel 1%{?rllh:.%{rllh}}%{!?rllh:.6} +%define rocky_rel 1%{?rllh:.%{rllh}}%{!?rllh:.7} %define rpm_license BSD-3-Clause %define dist .el%{major} %define home_url https://rockylinux.org/ @@ -293,7 +293,7 @@ cat > %{buildroot}%{_rpmmacrodir}/macros.dist << EOF %%centos_ver %{major} %%centos %{major} %%rhel %{major} -%%distcore .el%%{rocky} +%%distcore .el%{major} %%dist %%{!?distprefix0:%%{?distprefix}}%%{expand:%%{lua:for i=0,9999 do print("%%{?distprefix" .. i .."}") end}}%%{distcore}%%{?distsuffix}%%{?with_bootstrap:%{__bootstrap}} %%el%{major} 1 @@ -502,6 +502,9 @@ install -m 0644 %{SOURCE404} %{buildroot}/%{_prefix}/lib/sysctl.d/50-redhat.conf %{_datadir}/pki/sb-certs/* %changelog +* Fri Jun 07 2024 Louis Abel - 9.4-1.7 +- Fix macros + * Tue May 28 2024 Louis Abel - 9.4-1.6 - Add distcore macro