fix macros

This commit is contained in:
Louis Abel 2024-06-07 06:32:53 -07:00
parent 0f1903e64a
commit a121f3909b
Signed by: label
GPG Key ID: 2A6975660E424560

View File

@ -21,7 +21,7 @@
%define distro_code Blue Onyx %define distro_code Blue Onyx
%define major 9 %define major 9
%define minor 4 %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 rpm_license BSD-3-Clause
%define dist .el%{major} %define dist .el%{major}
%define home_url https://rockylinux.org/ %define home_url https://rockylinux.org/
@ -293,7 +293,7 @@ cat > %{buildroot}%{_rpmmacrodir}/macros.dist << EOF
%%centos_ver %{major} %%centos_ver %{major}
%%centos %{major} %%centos %{major}
%%rhel %{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}} %%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
@ -502,6 +502,9 @@ install -m 0644 %{SOURCE404} %{buildroot}/%{_prefix}/lib/sysctl.d/50-redhat.conf
%{_datadir}/pki/sb-certs/* %{_datadir}/pki/sb-certs/*
%changelog %changelog
* Fri Jun 07 2024 Louis Abel <label@rockylinux.org> - 9.4-1.7
- Fix macros
* Tue May 28 2024 Louis Abel <label@rockylinux.org> - 9.4-1.6 * Tue May 28 2024 Louis Abel <label@rockylinux.org> - 9.4-1.6
- Add distcore macro - Add distcore macro