backport distcore

This commit is contained in:
Louis Abel 2024-05-27 21:08:49 -07:00
parent 49fd480b22
commit 9850846901
Signed by: label
GPG Key ID: 2A6975660E424560

View File

@ -21,7 +21,7 @@
%define distro_code Green Obsidian %define distro_code Green Obsidian
%define major 8 %define major 8
%define minor 10 %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 upstream_rel %{major}.%{minor}-0.2
%define rpm_license BSD-3-Clause %define rpm_license BSD-3-Clause
%define dist .el%{major} %define dist .el%{major}
@ -275,7 +275,8 @@ cat > %{buildroot}%{_rpmmacrodir}/macros.dist << EOF
%%centos_ver %{major} %%centos_ver %{major}
%%centos %{major} %%centos %{major}
%%rhel %{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 %%el%{major} 1
%%dist_vendor %{dist_vendor} %%dist_vendor %{dist_vendor}
@ -436,6 +437,9 @@ ln -sr %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rockytesting \
%{_datadir}/pki/sb-certs/* %{_datadir}/pki/sb-certs/*
%changelog %changelog
* Mon May 27 2024 Louis Abel <label@rockylinux.org> - 8.10-1.8
- Backport distcore macro from 9 and 10
* Wed Apr 03 2024 Louis Abel <label@rockylinux.org> - 8.10-1.7 * Wed Apr 03 2024 Louis Abel <label@rockylinux.org> - 8.10-1.7
- Update SB certs - Update SB certs