Fix up macros

This commit is contained in:
nazunalika 2022-02-14 01:52:17 -07:00
parent ed0d0aea63
commit ab7beafe3e
Signed by: label
GPG Key ID: 6735C0E1BD65D048

View File

@ -16,7 +16,7 @@
%define distro_code Blue Onyx %define distro_code Blue Onyx
%define major 9 %define major 9
%define minor 0 %define minor 0
%define rocky_rel 1%{?rllh:.%{rllh}}%{!?rllh:.3} %define rocky_rel 1%{?rllh:.%{rllh}}%{!?rllh:.4}
%define rpm_license BSD-3-Clause %define rpm_license BSD-3-Clause
%define dist .el%{major} %define dist .el%{major}
@ -252,12 +252,13 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}/rpm
cat > %{buildroot}%{_sysconfdir}/rpm/macros.dist << EOF cat > %{buildroot}%{_sysconfdir}/rpm/macros.dist << EOF
# dist macros. # dist macros.
%%__bootstrap ~bootstrap
%%rocky_ver %{major} %%rocky_ver %{major}
%%rocky %{major} %%rocky %{major}
%%centos_ver %{major} %%centos_ver %{major}
%%centos %{major} %%centos %{major}
%%rhel %{major} %%rhel %{major}
%%dist .el%{major} %%dist %%{!?distprefix0:%%{?distprefix}}%%{expand:%%{lua:for i=0,9999 do print("%%{?distprefix" .. i .."}") end}}.el%{major}%%{?with_bootstrap:%{__bootstrap}}
%%el%{major} 1 %%el%{major} 1
EOF EOF
@ -404,9 +405,10 @@ install -m 0644 %{SOURCE404} %{buildroot}/%{_prefix}/lib/sysctl.d/50-redhat.conf
%{_datadir}/pki/sb-certs/*.crt %{_datadir}/pki/sb-certs/*.crt
%changelog %changelog
* Tue Feb 08 2022 Louis Abel <label@rockylinux.org> - 9.0-1.3 * Tue Feb 08 2022 Louis Abel <label@rockylinux.org> - 9.0-1.4
- Backport current SB certs for now - Backport current SB certs for now
- Add logrotate timer and switcheroo - Add logrotate timer and switcheroo
- Add missing macros
* Mon Jan 10 2022 Louis Abel <label@rockylinux.org> - 9.0-1.1 * Mon Jan 10 2022 Louis Abel <label@rockylinux.org> - 9.0-1.1
- Add LOGO to /etc/os-release - Add LOGO to /etc/os-release