From 9850846901573e8d91cad16a6c5a5914b1509a4e Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Mon, 27 May 2024 21:08:49 -0700 Subject: [PATCH] backport distcore --- SPECS/rocky-release.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/SPECS/rocky-release.spec b/SPECS/rocky-release.spec index 68dc724..c9afaa5 100644 --- a/SPECS/rocky-release.spec +++ b/SPECS/rocky-release.spec @@ -21,7 +21,7 @@ %define distro_code Green Obsidian %define major 8 %define minor 10 -%define rocky_rel 1%{?rllh:.%{rllh}}%{!?rllh:.7} +%define rocky_rel 1%{?rllh:.%{rllh}}%{!?rllh:.8} %define upstream_rel %{major}.%{minor}-0.2 %define rpm_license BSD-3-Clause %define dist .el%{major} @@ -275,7 +275,8 @@ cat > %{buildroot}%{_rpmmacrodir}/macros.dist << EOF %%centos_ver %{major} %%centos %{major} %%rhel %{major} -%%dist %%{!?distprefix0:%%{?distprefix}}%%{expand:%%{lua:for i=0,9999 do print("%%{?distprefix" .. i .."}") end}}.el%{major}%%{?distsuffix}%%{?with_bootstrap:%{__bootstrap}} +%%distcore .el%%{rocky} +%%dist %%{!?distprefix0:%%{?distprefix}}%%{expand:%%{lua:for i=0,9999 do print("%%{?distprefix" .. i .."}") end}}%%{distcore}%%{?distsuffix}%%{?with_bootstrap:%{__bootstrap}} %%el%{major} 1 %%dist_vendor %{dist_vendor} @@ -436,6 +437,9 @@ ln -sr %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rockytesting \ %{_datadir}/pki/sb-certs/* %changelog +* Mon May 27 2024 Louis Abel - 8.10-1.8 +- Backport distcore macro from 9 and 10 + * Wed Apr 03 2024 Louis Abel - 8.10-1.7 - Update SB certs