mirror of
https://git.rockylinux.org/staging/src/rocky-release.git
synced 2024-12-22 00:28:29 +00:00
fix macros
This commit is contained in:
parent
9850846901
commit
63d8d49f8e
@ -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:.8}
|
%define rocky_rel 1%{?rllh:.%{rllh}}%{!?rllh:.9}
|
||||||
%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,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
|
||||||
|
|
||||||
@ -437,6 +437,9 @@ ln -sr %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rockytesting \
|
|||||||
%{_datadir}/pki/sb-certs/*
|
%{_datadir}/pki/sb-certs/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jun 07 2024 Louis Abel <label@rockylinux.org> - 8.10-1.9
|
||||||
|
- Backport distcore macro from 9 and 10
|
||||||
|
|
||||||
* Mon May 27 2024 Louis Abel <label@rockylinux.org> - 8.10-1.8
|
* Mon May 27 2024 Louis Abel <label@rockylinux.org> - 8.10-1.8
|
||||||
- Backport distcore macro from 9 and 10
|
- Backport distcore macro from 9 and 10
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user