From d64f5c6051b9275ca8f8a09cc24c458e8e23b8e1 Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Fri, 7 Jun 2024 06:31:22 -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 97f7dda..be08389 100644 --- a/SPECS/rocky-release.spec +++ b/SPECS/rocky-release.spec @@ -21,7 +21,7 @@ %define distro_code Red Quartz %define major 10 %define minor 0 -%define rocky_rel 0%{?rllh:.%{rllh}}%{!?rllh:.11} +%define rocky_rel 0%{?rllh:.%{rllh}}%{!?rllh:.12} %define rpm_license BSD-3-Clause %define dist .el%{major} %define home_url https://rockylinux.org/ @@ -288,7 +288,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 @@ -482,6 +482,9 @@ install -p -m 0644 %{SOURCE102} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/ %{_datadir}/pki/sb-certs/* %changelog +* Thu May 30 2024 Louis Abel - 10.0-0.12 +- Fix macros + * Thu May 30 2024 Louis Abel - 10.0-0.11 - Enable cups