From 85363431c3a8e5580c2ae2ae11526a873902638d Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Fri, 31 Mar 2023 09:38:00 +0800 Subject: [PATCH] Move macros.dist into /usr/lib/rpm/macros.d --- anolis-release.spec | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/anolis-release.spec b/anolis-release.spec index 318c20d..9a37641 100644 --- a/anolis-release.spec +++ b/anolis-release.spec @@ -1,4 +1,4 @@ -%define anolis_release 2 +%define anolis_release 3 %define debug_package %{nil} %define product_family Anolis OS %define base_release_version 23 @@ -99,14 +99,17 @@ install -m 644 %{SOURCE101} %{buildroot}/etc/yum.repos.d install -m 644 %{SOURCE102} %{buildroot}/etc/yum.repos.d # set up the dist tag macros -install -d -m 755 %{buildroot}/etc/rpm -cat >> %{buildroot}/etc/rpm/macros.dist << EOF +install -d -m 755 %{buildroot}%{_rpmmacrodir} +cat >> %{buildroot}%{_rpmmacrodir}/macros.dist << EOF # dist macros. %%anolis_ver %{base_release_version} %%anolis %{base_release_version} %%anolis%{base_release_version} 1 %%dist %dist +%%dist_name %{product_family} +%%dist_home_url https://openanolis.cn/ +%%dist_bug_report_url https://bugzilla.openanolis.cn/ EOF # use unbranded datadir @@ -133,7 +136,7 @@ rm -rf %{buildroot} %config(noreplace) /etc/issue %config(noreplace) /etc/issue.net %{_prefix}/lib/systemd/system-preset/* -/etc/rpm/macros.dist +%{_rpmmacrodir}/macros.dist %{_docdir}/%{name} %{_datadir}/%{name} @@ -144,6 +147,10 @@ rm -rf %{buildroot} /etc/pki/rpm-gpg/ %changelog +* Fri Mar 31 2023 Funda Wang - 23-3 +- Move macros.dist into /usr/lib/rpm/macros.d +- Add several macros for downstream packages + * Fri Oct 14 2022 Chunmei Xu - 23-2 - add Plus repo -- Gitee